kernel: bcma: update to wireless-testing master-2013-10-01

[openwrt.git] / target / linux / generic / patches-3.6 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.6/721-phy_packets.patch b/target/linux/generic/patches-3.6/721-phy_packets.patch
index e8578de..70b65a8 100644 (file)
--- a/target/linux/generic/patches-3.6/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.6/721-phy_packets.patch
@@ -34,7 +34,7 @@
  #define IF_GET_IFACE  0x0001          /* for querying only */
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1656,6 +1656,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1653,6 +1653,10 @@ static inline int pskb_trim(struct sk_bu
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
  
@@ -45,7 +45,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -1758,16 +1762,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1755,16 +1759,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  
@@ -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
 +