netdevice.h: check for CONFIG_WLAN instead of CONFIG_WLAN_80211

[pandora-kernel.git] / include / linux / if_vlan.h

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 71a4870..3d870fd 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -120,10 +120,12 @@ extern u16 vlan_dev_vlan_id(const struct net_device *dev);
 extern int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                             u16 vlan_tci, int polling);
 extern int vlan_hwaccel_do_receive(struct sk_buff *skb);
-extern int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
-                           unsigned int vlan_tci, struct sk_buff *skb);
-extern int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
-                         unsigned int vlan_tci);
+extern gro_result_t
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+                unsigned int vlan_tci, struct sk_buff *skb);
+extern gro_result_t
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+              unsigned int vlan_tci);
 
 #else
 static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
@@ -150,17 +152,18 @@ static inline int vlan_hwaccel_do_receive(struct sk_buff *skb)
        return 0;
 }
 
-static inline int vlan_gro_receive(struct napi_struct *napi,
-                                  struct vlan_group *grp,
-                                  unsigned int vlan_tci, struct sk_buff *skb)
+static inline gro_result_t
+vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+                unsigned int vlan_tci, struct sk_buff *skb)
 {
-       return NET_RX_DROP;
+       return GRO_DROP;
 }
 
-static inline int vlan_gro_frags(struct napi_struct *napi,
-                                struct vlan_group *grp, unsigned int vlan_tci)
+static inline gro_result_t
+vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+              unsigned int vlan_tci)
 {
-       return NET_RX_DROP;
+       return GRO_DROP;
 }
 #endif
 
@@ -336,6 +339,7 @@ enum vlan_ioctl_cmds {
 enum vlan_flags {
        VLAN_FLAG_REORDER_HDR   = 0x1,
        VLAN_FLAG_GVRP          = 0x2,
+       VLAN_FLAG_LOOSE_BINDING = 0x4,
 };
 
 enum vlan_name_types {