From ab70aef2efe5846992aaa5f3b829318377b13e8e Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 15 Feb 2013 07:36:15 +0000 Subject: kernel: update linux 3.7 to 3.7.8 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35604 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.7/721-phy_packets.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.7/721-phy_packets.patch') diff --git a/target/linux/generic/patches-3.7/721-phy_packets.patch b/target/linux/generic/patches-3.7/721-phy_packets.patch index 8dda0934b..b8c15fcc6 100644 --- a/target/linux/generic/patches-3.7/721-phy_packets.patch +++ b/target/linux/generic/patches-3.7/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1074,6 +1074,11 @@ struct net_device { +@@ -1077,6 +1077,11 @@ struct net_device { const struct net_device_ops *netdev_ops; const struct ethtool_ops *ethtool_ops; @@ -12,7 +12,7 @@ /* Hardware header description */ const struct header_ops *header_ops; -@@ -1130,6 +1135,9 @@ struct net_device { +@@ -1133,6 +1138,9 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ -- cgit v1.2.3 From eabca30cd9bdbd0747a6a860c2573a7445ae8203 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 22 Apr 2013 15:01:36 +0000 Subject: kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36378 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.7/721-phy_packets.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/generic/patches-3.7/721-phy_packets.patch') diff --git a/target/linux/generic/patches-3.7/721-phy_packets.patch b/target/linux/generic/patches-3.7/721-phy_packets.patch index b8c15fcc6..78b2d69b4 100644 --- a/target/linux/generic/patches-3.7/721-phy_packets.patch +++ b/target/linux/generic/patches-3.7/721-phy_packets.patch @@ -145,7 +145,7 @@ + struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); + +#ifdef CONFIG_ETHERNET_PACKET_MANGLE -+ if (dev->priv_flags & IFF_NO_IP_ALIGN) ++ if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN)) + return skb; +#endif + -- cgit v1.2.3