net: vlan: enable soft features regardless of underlying device
[linux-2.6.git] / net / 8021q / vlan_core.c
index 889f4ac..fcc6846 100644 (file)
@@ -4,71 +4,63 @@
 #include <linux/netpoll.h>
 #include "vlan.h"
 
-/* VLAN rx hw acceleration helper.  This acts like netif_{rx,receive_skb}(). */
-int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
-                     u16 vlan_tci, int polling)
+bool vlan_do_receive(struct sk_buff **skbp)
 {
+       struct sk_buff *skb = *skbp;
+       u16 vlan_id = skb->vlan_tci & VLAN_VID_MASK;
        struct net_device *vlan_dev;
-       u16 vlan_id;
-
-       if (netpoll_rx(skb))
-               return NET_RX_DROP;
-
-       if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-               skb->deliver_no_wcard = 1;
-
-       skb->skb_iif = skb->dev->ifindex;
-       __vlan_hwaccel_put_tag(skb, vlan_tci);
-       vlan_id = vlan_tci & VLAN_VID_MASK;
-       vlan_dev = vlan_group_get_device(grp, vlan_id);
-
-       if (vlan_dev)
-               skb->dev = vlan_dev;
-       else if (vlan_id)
-               goto drop;
+       struct vlan_pcpu_stats *rx_stats;
 
-       return (polling ? netif_receive_skb(skb) : netif_rx(skb));
+       vlan_dev = vlan_find_dev(skb->dev, vlan_id);
+       if (!vlan_dev) {
+               if (vlan_id)
+                       skb->pkt_type = PACKET_OTHERHOST;
+               return false;
+       }
 
-drop:
-       dev_kfree_skb_any(skb);
-       return NET_RX_DROP;
-}
-EXPORT_SYMBOL(__vlan_hwaccel_rx);
+       skb = *skbp = skb_share_check(skb, GFP_ATOMIC);
+       if (unlikely(!skb))
+               return false;
 
-void vlan_hwaccel_do_receive(struct sk_buff *skb)
-{
-       struct net_device *dev = skb->dev;
-       struct vlan_rx_stats     *rx_stats;
+       skb->dev = vlan_dev;
+       if (skb->pkt_type == PACKET_OTHERHOST) {
+               /* Our lower layer thinks this is not local, let's make sure.
+                * This allows the VLAN to have a different MAC than the
+                * underlying device, and still route correctly. */
+               if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+                                       vlan_dev->dev_addr))
+                       skb->pkt_type = PACKET_HOST;
+       }
 
-       skb->dev = vlan_dev_real_dev(dev);
-       netif_nit_deliver(skb);
+       if (!(vlan_dev_info(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR)) {
+               unsigned int offset = skb->data - skb_mac_header(skb);
+
+               /*
+                * vlan_insert_tag expect skb->data pointing to mac header.
+                * So change skb->data before calling it and change back to
+                * original position later
+                */
+               skb_push(skb, offset);
+               skb = *skbp = vlan_insert_tag(skb, skb->vlan_tci);
+               if (!skb)
+                       return false;
+               skb_pull(skb, offset + VLAN_HLEN);
+               skb_reset_mac_len(skb);
+       }
 
-       skb->dev = dev;
-       skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
+       skb->priority = vlan_get_ingress_priority(vlan_dev, skb->vlan_tci);
        skb->vlan_tci = 0;
 
-       rx_stats = this_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats);
+       rx_stats = this_cpu_ptr(vlan_dev_info(vlan_dev)->vlan_pcpu_stats);
 
        u64_stats_update_begin(&rx_stats->syncp);
        rx_stats->rx_packets++;
        rx_stats->rx_bytes += skb->len;
-
-       switch (skb->pkt_type) {
-       case PACKET_BROADCAST:
-               break;
-       case PACKET_MULTICAST:
+       if (skb->pkt_type == PACKET_MULTICAST)
                rx_stats->rx_multicast++;
-               break;
-       case PACKET_OTHERHOST:
-               /* Our lower layer thinks this is not local, let's make sure.
-                * This allows the VLAN to have a different MAC than the
-                * underlying device, and still route correctly. */
-               if (!compare_ether_addr(eth_hdr(skb)->h_dest,
-                                       dev->dev_addr))
-                       skb->pkt_type = PACKET_HOST;
-               break;
-       }
        u64_stats_update_end(&rx_stats->syncp);
+
+       return true;
 }
 
 struct net_device *vlan_dev_real_dev(const struct net_device *dev)
@@ -83,71 +75,105 @@ u16 vlan_dev_vlan_id(const struct net_device *dev)
 }
 EXPORT_SYMBOL(vlan_dev_vlan_id);
 
-static gro_result_t
-vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
-               unsigned int vlan_tci, struct sk_buff *skb)
+/* VLAN rx hw acceleration helper.  This acts like netif_{rx,receive_skb}(). */
+int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
+                     u16 vlan_tci, int polling)
 {
-       struct sk_buff *p;
-       struct net_device *vlan_dev;
-       u16 vlan_id;
-
-       if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-               skb->deliver_no_wcard = 1;
-
-       skb->skb_iif = skb->dev->ifindex;
        __vlan_hwaccel_put_tag(skb, vlan_tci);
-       vlan_id = vlan_tci & VLAN_VID_MASK;
-       vlan_dev = vlan_group_get_device(grp, vlan_id);
-
-       if (vlan_dev)
-               skb->dev = vlan_dev;
-       else if (vlan_id)
-               goto drop;
-
-       for (p = napi->gro_list; p; p = p->next) {
-               unsigned long diffs;
-
-               diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
-               diffs |= compare_ether_header(skb_mac_header(p),
-                                             skb_gro_mac_header(skb));
-               NAPI_GRO_CB(p)->same_flow = !diffs;
-               NAPI_GRO_CB(p)->flush = 0;
-       }
-
-       return dev_gro_receive(napi, skb);
-
-drop:
-       return GRO_DROP;
+       return polling ? netif_receive_skb(skb) : netif_rx(skb);
 }
+EXPORT_SYMBOL(__vlan_hwaccel_rx);
 
 gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
                              unsigned int vlan_tci, struct sk_buff *skb)
 {
-       if (netpoll_rx_on(skb))
-               return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
-                       ? GRO_DROP : GRO_NORMAL;
-
-       skb_gro_reset_offset(skb);
-
-       return napi_skb_finish(vlan_gro_common(napi, grp, vlan_tci, skb), skb);
+       __vlan_hwaccel_put_tag(skb, vlan_tci);
+       return napi_gro_receive(napi, skb);
 }
 EXPORT_SYMBOL(vlan_gro_receive);
 
 gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
                            unsigned int vlan_tci)
 {
-       struct sk_buff *skb = napi_frags_skb(napi);
+       __vlan_hwaccel_put_tag(napi->skb, vlan_tci);
+       return napi_gro_frags(napi);
+}
+EXPORT_SYMBOL(vlan_gro_frags);
 
-       if (!skb)
-               return GRO_DROP;
+static struct sk_buff *vlan_reorder_header(struct sk_buff *skb)
+{
+       if (skb_cow(skb, skb_headroom(skb)) < 0)
+               return NULL;
+       memmove(skb->data - ETH_HLEN, skb->data - VLAN_ETH_HLEN, 2 * ETH_ALEN);
+       skb->mac_header += VLAN_HLEN;
+       skb_reset_mac_len(skb);
+       return skb;
+}
 
-       if (netpoll_rx_on(skb)) {
-               skb->protocol = eth_type_trans(skb, skb->dev);
-               return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
-                       ? GRO_DROP : GRO_NORMAL;
+static void vlan_set_encap_proto(struct sk_buff *skb, struct vlan_hdr *vhdr)
+{
+       __be16 proto;
+       unsigned char *rawp;
+
+       /*
+        * Was a VLAN packet, grab the encapsulated protocol, which the layer
+        * three protocols care about.
+        */
+
+       proto = vhdr->h_vlan_encapsulated_proto;
+       if (ntohs(proto) >= 1536) {
+               skb->protocol = proto;
+               return;
        }
 
-       return napi_frags_finish(napi, skb,
-                                vlan_gro_common(napi, grp, vlan_tci, skb));
+       rawp = skb->data;
+       if (*(unsigned short *) rawp == 0xFFFF)
+               /*
+                * This is a magic hack to spot IPX packets. Older Novell
+                * breaks the protocol design and runs IPX over 802.3 without
+                * an 802.2 LLC layer. We look for FFFF which isn't a used
+                * 802.2 SSAP/DSAP. This won't work for fault tolerant netware
+                * but does for the rest.
+                */
+               skb->protocol = htons(ETH_P_802_3);
+       else
+               /*
+                * Real 802.2 LLC
+                */
+               skb->protocol = htons(ETH_P_802_2);
+}
+
+struct sk_buff *vlan_untag(struct sk_buff *skb)
+{
+       struct vlan_hdr *vhdr;
+       u16 vlan_tci;
+
+       if (unlikely(vlan_tx_tag_present(skb))) {
+               /* vlan_tci is already set-up so leave this for another time */
+               return skb;
+       }
+
+       skb = skb_share_check(skb, GFP_ATOMIC);
+       if (unlikely(!skb))
+               goto err_free;
+
+       if (unlikely(!pskb_may_pull(skb, VLAN_HLEN)))
+               goto err_free;
+
+       vhdr = (struct vlan_hdr *) skb->data;
+       vlan_tci = ntohs(vhdr->h_vlan_TCI);
+       __vlan_hwaccel_put_tag(skb, vlan_tci);
+
+       skb_pull_rcsum(skb, VLAN_HLEN);
+       vlan_set_encap_proto(skb, vhdr);
+
+       skb = vlan_reorder_header(skb);
+       if (unlikely(!skb))
+               goto err_free;
+
+       return skb;
+
+err_free:
+       kfree_skb(skb);
+       return NULL;
 }
-EXPORT_SYMBOL(vlan_gro_frags);