Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Wed, 20 Mar 2013 16:46:26 +0000 (12:46 -0400)]
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.

Signed-off-by: David S. Miller <davem@davemloft.net>

21 files changed:
1  2 
drivers/infiniband/hw/cxgb4/cm.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec.c
drivers/net/ethernet/nxp/lpc_eth.c
drivers/net/ethernet/renesas/sh_eth.c
drivers/net/ethernet/sfc/nic.c
drivers/net/ethernet/ti/cpsw.c
include/linux/skbuff.h
net/bridge/br_netlink.c
net/core/dev.c
net/core/flow_dissector.c
net/core/rtnetlink.c
net/ipv4/ip_gre.c
net/ipv4/tcp.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/openvswitch/datapath.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
  }
  EXPORT_SYMBOL(skb_checksum_help);
  
 -/**
 - *    skb_mac_gso_segment - mac layer segmentation handler.
 - *    @skb: buffer to segment
 - *    @features: features for the output path (see dev->features)
 - */
 -struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb,
 -                                  netdev_features_t features)
 +__be16 skb_network_protocol(struct sk_buff *skb)
  {
 -      struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT);
 -      struct packet_offload *ptype;
        __be16 type = skb->protocol;
+       int vlan_depth = ETH_HLEN;
  
        while (type == htons(ETH_P_8021Q)) {
-               int vlan_depth = ETH_HLEN;
                struct vlan_hdr *vh;
  
                if (unlikely(!pskb_may_pull(skb, vlan_depth + VLAN_HLEN)))
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge