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-a3cf2f4a3e73master
parent
076d88f618
commit
431e5b64bc
|
@ -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
|
||||||
+
|
+
|
||||||
|
|
|
@ -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
|
||||||
+
|
+
|
||||||
|
|
|
@ -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
|
||||||
+
|
+
|
||||||
|
|
|
@ -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
|
||||||
+
|
+
|
||||||
|
|
|
@ -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
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in New Issue