Browse Source

kernel: allow __netdev_alloc_skb_ip_align to be called with dev = NULL

SVN-Revision: 36378
Felix Fietkau 12 years ago
parent
commit
a8a01b42ae

+ 1 - 1
target/linux/generic/patches-3.3/721-phy_packets.patch

@@ -145,7 +145,7 @@
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +		return skb;
 +#endif
 +#endif
 +
 +

+ 1 - 1
target/linux/generic/patches-3.6/721-phy_packets.patch

@@ -145,7 +145,7 @@
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +		return skb;
 +#endif
 +#endif
 +
 +

+ 1 - 1
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);
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +		return skb;
 +#endif
 +#endif
 +
 +

+ 1 - 1
target/linux/generic/patches-3.8/721-phy_packets.patch

@@ -145,7 +145,7 @@
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +		return skb;
 +#endif
 +#endif
 +
 +

+ 1 - 1
target/linux/generic/patches-3.9/721-phy_packets.patch

@@ -145,7 +145,7 @@
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +	struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp);
 +
 +
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
 +#ifdef CONFIG_ETHERNET_PACKET_MANGLE
-+	if (dev->priv_flags & IFF_NO_IP_ALIGN)
++	if (dev && (dev->priv_flags & IFF_NO_IP_ALIGN))
 +		return skb;
 +		return skb;
 +#endif
 +#endif
 +
 +