diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-12 17:49:01 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-12 17:49:01 +0000 |
| commit | d8297bb0a4e520c83175a987ff70e4a72f2bd603 (patch) | |
| tree | 701089c26274a474abbf02d62843dd79187ca46b /target/linux/atheros | |
| parent | a1b7c85cd4b2c2af1392b26b72893ee164e8d351 (diff) | |
[kernel] update to 2.6.25.20, 2.6.26.8, 2.6.27.5 and refresh patches
* based on a patch by Hauke Mehrtens
* closes #4193
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13192 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros')
| -rw-r--r-- | target/linux/atheros/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/atheros/patches-2.6.26/150-bridge-printk.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index fdc83e577..339940545 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros 231x/5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.26.7 +LINUX_VERSION:=2.6.26.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch index 97b2ddf6b..b5c80cdfc 100644 --- a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch +++ b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch @@ -1,6 +1,6 @@ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3786,8 +3786,8 @@ int register_netdevice(struct net_device +@@ -3783,8 +3783,8 @@ int register_netdevice(struct net_device /* Fix illegal SG+CSUM combinations. */ if ((dev->features & NETIF_F_SG) && !(dev->features & NETIF_F_ALL_CSUM)) { @@ -11,7 +11,7 @@ dev->features &= ~NETIF_F_SG; } -@@ -3800,9 +3800,9 @@ int register_netdevice(struct net_device +@@ -3797,9 +3797,9 @@ int register_netdevice(struct net_device } if (dev->features & NETIF_F_UFO) { if (!(dev->features & NETIF_F_HW_CSUM)) { |