mac80211: fix kernel-doc

[safe/jmp/linux-2.6] / include / linux / if_vlan.h

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index a5cb0c3..7ff9af1 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -115,6 +115,10 @@ 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);
 
 #else
 static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
@@ -140,6 +144,19 @@ 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)
+{
+       return NET_RX_DROP;
+}
+
+static inline int vlan_gro_frags(struct napi_struct *napi,
+                                struct vlan_group *grp, unsigned int vlan_tci)
+{
+       return NET_RX_DROP;
+}
 #endif
 
 /**
@@ -191,6 +208,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
 
        /* Move the mac addresses to the beginning of the new header. */
        memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+       skb->mac_header -= VLAN_HLEN;
 
        /* first, the ethernet type */
        veth->h_vlan_proto = htons(ETH_P_8021Q);