[arch-commits] Commit in r8168/repos/community-staging-x86_64 (4 files)
Date: Sunday, May 10, 2020 @ 11:32:59 Author: heftig Revision: 626158 archrelease: copy trunk to community-staging-x86_64 Added: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 626153, r8168/trunk/0001-linux-5.6.patch) r8168/repos/community-staging-x86_64/PKGBUILD (from rev 626153, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch r8168/repos/community-staging-x86_64/PKGBUILD --+ 0001-linux-5.6.patch | 142 - PKGBUILD | 88 +++--- 2 files changed, 115 insertions(+), 115 deletions(-) Deleted: 0001-linux-5.6.patch === --- 0001-linux-5.6.patch2020-05-10 11:32:59 UTC (rev 626157) +++ 0001-linux-5.6.patch2020-05-10 11:32:59 UTC (rev 626158) @@ -1,71 +0,0 @@ -diff --git a/src/r8168_n.c b/src/r8168_n.c -index 0df6041..557823e 100755 a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); - static void rtl8168_hw_start(struct net_device *dev); - static int rtl8168_close(struct net_device *dev); - static void rtl8168_set_rx_mode(struct net_device *dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); -+#else - static void rtl8168_tx_timeout(struct net_device *dev); -+#endif - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); -@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file) - - return single_open(file, show, dev); - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static const struct proc_ops rtl8168_proc_ops = { -+.proc_open = rtl8168_proc_open, -+.proc_read = seq_read, -+.proc_lseek = seq_lseek, -+.proc_release= single_release, -+}; -+#else - static const struct file_operations rtl8168_proc_fops = { - .open = rtl8168_proc_open, - .read = seq_read, -@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = { - .release= single_release, - }; - #endif -+#endif - - /* - * Table of proc files we need to create. -@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev) - tp->proc_dir = dir; - proc_init_num++; - --for (f = rtl8168_proc_files; f->name[0]; f++) { --if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -- &rtl8168_proc_fops, f->show)) { -+ for (f = rtl8168_proc_files; f->name[0]; f++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_ops, f->show)) -+#else -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_fops, f->show)) -+#endif -+ { - printk("Unable to initialize " -"/proc/net/%s/%s/%s\n", -MODULENAME, dev->name, f->name); -@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work) - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) -+#else - rtl8168_tx_timeout(struct net_device *dev) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - unsigned long flags; Copied: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 626153, r8168/trunk/0001-linux-5.6.patch) === --- 0001-linux-5.6.patch(rev 0) +++ 0001-linux-5.6.patch2020-05-10 11:32:59 UTC (rev 626158) @@ -0,0 +1,71 @@ +diff --git a/src/r8168_n.c b/src/r8168_n.c +index 0df6041..557823e 100755 +--- a/src/r8168_n.c b/src/r8168_n.c +@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); + static void rtl8168_hw_start(struct net_device *dev); + static int rtl8168_close(struct net_device *dev); + static void rtl8168_set_rx_mode(struct net_device *dev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) ++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); ++#else + static void rtl8168_tx_timeout(struct net_device *dev); ++#endif + static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); + static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *,
[arch-commits] Commit in r8168/repos/community-staging-x86_64 (4 files)
Date: Saturday, May 9, 2020 @ 20:01:22 Author: heftig Revision: 626083 archrelease: copy trunk to community-staging-x86_64 Added: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 626075, r8168/trunk/0001-linux-5.6.patch) r8168/repos/community-staging-x86_64/PKGBUILD (from rev 626075, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch r8168/repos/community-staging-x86_64/PKGBUILD --+ 0001-linux-5.6.patch | 142 - PKGBUILD | 88 +++--- 2 files changed, 115 insertions(+), 115 deletions(-) Deleted: 0001-linux-5.6.patch === --- 0001-linux-5.6.patch2020-05-09 20:01:20 UTC (rev 626082) +++ 0001-linux-5.6.patch2020-05-09 20:01:22 UTC (rev 626083) @@ -1,71 +0,0 @@ -diff --git a/src/r8168_n.c b/src/r8168_n.c -index 0df6041..557823e 100755 a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); - static void rtl8168_hw_start(struct net_device *dev); - static int rtl8168_close(struct net_device *dev); - static void rtl8168_set_rx_mode(struct net_device *dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); -+#else - static void rtl8168_tx_timeout(struct net_device *dev); -+#endif - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); -@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file) - - return single_open(file, show, dev); - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static const struct proc_ops rtl8168_proc_ops = { -+.proc_open = rtl8168_proc_open, -+.proc_read = seq_read, -+.proc_lseek = seq_lseek, -+.proc_release= single_release, -+}; -+#else - static const struct file_operations rtl8168_proc_fops = { - .open = rtl8168_proc_open, - .read = seq_read, -@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = { - .release= single_release, - }; - #endif -+#endif - - /* - * Table of proc files we need to create. -@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev) - tp->proc_dir = dir; - proc_init_num++; - --for (f = rtl8168_proc_files; f->name[0]; f++) { --if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -- &rtl8168_proc_fops, f->show)) { -+ for (f = rtl8168_proc_files; f->name[0]; f++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_ops, f->show)) -+#else -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_fops, f->show)) -+#endif -+ { - printk("Unable to initialize " -"/proc/net/%s/%s/%s\n", -MODULENAME, dev->name, f->name); -@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work) - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) -+#else - rtl8168_tx_timeout(struct net_device *dev) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - unsigned long flags; Copied: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 626075, r8168/trunk/0001-linux-5.6.patch) === --- 0001-linux-5.6.patch(rev 0) +++ 0001-linux-5.6.patch2020-05-09 20:01:22 UTC (rev 626083) @@ -0,0 +1,71 @@ +diff --git a/src/r8168_n.c b/src/r8168_n.c +index 0df6041..557823e 100755 +--- a/src/r8168_n.c b/src/r8168_n.c +@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); + static void rtl8168_hw_start(struct net_device *dev); + static int rtl8168_close(struct net_device *dev); + static void rtl8168_set_rx_mode(struct net_device *dev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) ++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); ++#else + static void rtl8168_tx_timeout(struct net_device *dev); ++#endif + static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); + static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *,
[arch-commits] Commit in r8168/repos/community-staging-x86_64 (4 files)
Date: Sunday, April 5, 2020 @ 03:17:22 Author: heftig Revision: 611790 archrelease: copy trunk to community-staging-x86_64 Added: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 611785, r8168/trunk/0001-linux-5.6.patch) r8168/repos/community-staging-x86_64/PKGBUILD (from rev 611786, r8168/trunk/PKGBUILD) Deleted: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch r8168/repos/community-staging-x86_64/PKGBUILD --+ 0001-linux-5.6.patch | 142 - PKGBUILD | 90 +++ 2 files changed, 116 insertions(+), 116 deletions(-) Deleted: 0001-linux-5.6.patch === --- 0001-linux-5.6.patch2020-04-05 03:17:22 UTC (rev 611789) +++ 0001-linux-5.6.patch2020-04-05 03:17:22 UTC (rev 611790) @@ -1,71 +0,0 @@ -diff --git a/src/r8168_n.c b/src/r8168_n.c -index 0df6041..557823e 100755 a/src/r8168_n.c -+++ b/src/r8168_n.c -@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); - static void rtl8168_hw_start(struct net_device *dev); - static int rtl8168_close(struct net_device *dev); - static void rtl8168_set_rx_mode(struct net_device *dev); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); -+#else - static void rtl8168_tx_timeout(struct net_device *dev); -+#endif - static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); - static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget); - static int rtl8168_change_mtu(struct net_device *dev, int new_mtu); -@@ -1615,7 +1619,14 @@ static int rtl8168_proc_open(struct inode *inode, struct file *file) - - return single_open(file, show, dev); - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+static const struct proc_ops rtl8168_proc_ops = { -+.proc_open = rtl8168_proc_open, -+.proc_read = seq_read, -+.proc_lseek = seq_lseek, -+.proc_release= single_release, -+}; -+#else - static const struct file_operations rtl8168_proc_fops = { - .open = rtl8168_proc_open, - .read = seq_read, -@@ -1623,6 +1634,7 @@ static const struct file_operations rtl8168_proc_fops = { - .release= single_release, - }; - #endif -+#endif - - /* - * Table of proc files we need to create. -@@ -1665,9 +1677,15 @@ static void rtl8168_proc_init(struct net_device *dev) - tp->proc_dir = dir; - proc_init_num++; - --for (f = rtl8168_proc_files; f->name[0]; f++) { --if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -- &rtl8168_proc_fops, f->show)) { -+ for (f = rtl8168_proc_files; f->name[0]; f++) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_ops, f->show)) -+#else -+ if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir, -+ &rtl8168_proc_fops, f->show)) -+#endif -+ { - printk("Unable to initialize " -"/proc/net/%s/%s/%s\n", -MODULENAME, dev->name, f->name); -@@ -27844,7 +27861,11 @@ static void rtl8168_reset_task(struct work_struct *work) - } - - static void -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) -+rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue) -+#else - rtl8168_tx_timeout(struct net_device *dev) -+#endif - { - struct rtl8168_private *tp = netdev_priv(dev); - unsigned long flags; Copied: r8168/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 611785, r8168/trunk/0001-linux-5.6.patch) === --- 0001-linux-5.6.patch(rev 0) +++ 0001-linux-5.6.patch2020-04-05 03:17:22 UTC (rev 611790) @@ -0,0 +1,71 @@ +diff --git a/src/r8168_n.c b/src/r8168_n.c +index 0df6041..557823e 100755 +--- a/src/r8168_n.c b/src/r8168_n.c +@@ -456,7 +456,11 @@ static void rtl8168_hw_config(struct net_device *dev); + static void rtl8168_hw_start(struct net_device *dev); + static int rtl8168_close(struct net_device *dev); + static void rtl8168_set_rx_mode(struct net_device *dev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0) ++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int new_mtu); ++#else + static void rtl8168_tx_timeout(struct net_device *dev); ++#endif + static struct net_device_stats *rtl8168_get_stats(struct net_device *dev); + static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *
[arch-commits] Commit in r8168/repos/community-staging-x86_64 (4 files)
Date: Friday, April 6, 2018 @ 23:59:57 Author: heftig Revision: 314623 archrelease: copy trunk to community-staging-x86_64 Added: r8168/repos/community-staging-x86_64/PKGBUILD (from rev 314622, r8168/trunk/PKGBUILD) r8168/repos/community-staging-x86_64/linux-4.15.patch (from rev 314622, r8168/trunk/linux-4.15.patch) Deleted: r8168/repos/community-staging-x86_64/PKGBUILD r8168/repos/community-staging-x86_64/linux-4.15.patch --+ PKGBUILD | 98 linux-4.15.patch | 162 ++--- 2 files changed, 130 insertions(+), 130 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2018-04-06 23:59:36 UTC (rev 314622) +++ PKGBUILD2018-04-06 23:59:57 UTC (rev 314623) @@ -1,49 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip , Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.045.08 -pkgrel=46 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw"; -license=("GPL") -arch=('x86_64') -depends=('glibc' 'linux') -makedepends=('linux-headers') -source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz -linux-4.15.patch) -sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31' -'6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../linux-4.15.patch -} - -build() { - _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#') - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version) - msg2 "Kernel = $KERNEL_VERSION" - - cd "$pkgname-$pkgver" - # avoid using the Makefile directly -- it doesn't understand - # any kernel but the current. - make -C /usr/lib/modules/$KERNEL_VERSION/build \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#') - depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)") - - cd "$pkgname-$pkgver" - install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644 src/*.ko - find "$pkgdir" -name '*.ko' -exec xz {} + - - echo "blacklist r8169" | \ - install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf" -} Copied: r8168/repos/community-staging-x86_64/PKGBUILD (from rev 314622, r8168/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2018-04-06 23:59:57 UTC (rev 314623) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip , Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.045.08 +pkgrel=47 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw"; +license=("GPL") +arch=('x86_64') +depends=('glibc' 'linux') +makedepends=('linux-headers') +source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz +linux-4.15.patch) +sha256sums=('18161cb72fc872a9aed194514f7b8fb8b255b6fa6ed3d2dd459700eaad575f31' +'6434f0d1fcb08e3605a17859d3b8946c65bcf14737e223315b6468b3394c5cd7') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../linux-4.15.patch +} + +build() { + _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#') + KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version) + msg2 "Kernel = $KERNEL_VERSION" + + cd "$pkgname-$pkgver" + # avoid using the Makefile directly -- it doesn't understand + # any kernel but the current. + make -C /usr/lib/modules/$KERNEL_VERSION/build \ + SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ + EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ + modules +} + +package() { + _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#') + depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)") + + cd "$pkgname-$pkgver" + install -Dt "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH" -m644 src/*.ko + find "$pkgdir" -name '*.ko' -exec xz {} + + + echo "blacklist r8169" | \ + install -Dm644 /dev/stdin "$pkgdir/usr/lib/modprobe.d/r8168.conf" +} Deleted: linux-4.15.patch === --- linux-4.15.patch2018-04-06 23:59:36 UTC (rev 314622) +++ linux-4.15.patch2018-04-06 23:59:57 UTC (rev 314623) @@ -1,81 +0,0 @@ -diff -u