summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'vxlan-rx-cleanups'David S. Miller2016-02-251-67/+64
|\
| * vxlan: simplify metadata_dst usage in vxlan_rcvJiri Benc2016-02-251-12/+7
| * vxlan: consolidate rx handling to a single functionJiri Benc2016-02-251-44/+28
| * vxlan: move ECN decapsulation to a separate functionJiri Benc2016-02-251-31/+31
| * vxlan: move inner L2 header processing to a separate functionJiri Benc2016-02-251-16/+33
| * vxlan: consolidate GBP handling even moreJiri Benc2016-02-251-4/+5
|/
* Merge branch 'tc_action-ns'David S. Miller2016-02-2514-153/+771
|\
| * net_sched: add network namespace support for tc actionsWANG Cong2016-02-2514-149/+746
| * net_sched: prepare tcf_hashinfo_destroy() for netns supportWANG Cong2016-02-252-8/+29
|/
* ppp: clarify parsing of user supplied data in ppp_set_compress()Guillaume Nault2016-02-241-5/+7
* bnx2x: add a separate GENEVE Kconfig symbolArnd Bergmann2016-02-242-7/+17
* Merge branch 'gianfar-xmit-improvements'David S. Miller2016-02-241-52/+48
|\
| * gianfar: Remove redundant ops for do_tstamp from xmit()Claudiu Manoil2016-02-241-9/+5
| * gianfar: Use skb_frag_t pointers inside xmit()Claudiu Manoil2016-02-241-9/+9
| * gianfar: Map head TxBD firstClaudiu Manoil2016-02-241-48/+48
|/
* bgmac: support Ethernet device on BCM47094 SoCRafał Miłecki2016-02-241-2/+4
* Merge branch 'be2net-fixes'David S. Miller2016-02-243-18/+32
|\
| * be2net: Fix a UE caused by passing large frames to the ASICajit.khaparde@broadcom.com2016-02-242-1/+13
| * be2net: Declare some u16 fields as u32 to improve performanceajit.khaparde@broadcom.com2016-02-243-17/+19
|/
* Merge branch 'flow_dissector-fixes-and-improvements'David S. Miller2016-02-242-20/+28
|\
| * eth: Pull header from first fragment via eth_get_headlenAlexander Duyck2016-02-241-1/+2
| * flow_dissector: Use same pointer for IPv4 and IPv6 addressesAlexander Duyck2016-02-241-6/+5
| * flow_dissector: Correctly handle parsing FCoEAlexander Duyck2016-02-241-2/+5
| * flow_dissector: Fix fragment handling for header length computationAlexander Duyck2016-02-241-3/+7
| * flow_dissector: Check for IP fragmentation even if not using IPv4 addressAlexander Duyck2016-02-241-8/+9
|/
* Merge branch 'mlx5-next'David S. Miller2016-02-2417-68/+1382
|\
| * net/mlx5e: Add TX inner packet countersMatthew Finlay2016-02-243-12/+32
| * net/mlx5e: Add TX stateless offloads for tunnelingMatthew Finlay2016-02-241-6/+16
| * net/mlx5e: Add netdev support for VXLAN tunnelingMatthew Finlay2016-02-246-3/+332
| * net/mlx5e: Protect en header file from redefinitionsMatthew Finlay2016-02-241-1/+5
| * net/mlx5e: Move to checksum completeMatthew Finlay2016-02-241-4/+5
| * net/mlx5e: Wake On LAN supportTariq Toukan2016-02-246-1/+243
| * net/mlx5e: Implement DCBNL IEEE max rateTariq Toukan2016-02-244-0/+150
| * net/mlx5e: Support DCBNL IEEE PFCAchiad Shochat2016-02-241-0/+39
| * net/mlx5e: Support DCBNL IEEE ETSSaeed Mahameed2016-02-246-15/+317
| * net/mlx5: Introduce physical port TC/prio access functionsSaeed Mahameed2016-02-244-1/+132
| * net/mlx5: Introduce physical port PFC access functionsAchiad Shochat2016-02-242-0/+45
| * net/mlx5: Introduce a new header file for physical port functionsAchiad Shochat2016-02-245-31/+72
|/
* soreuseport: fix merge conflict in tcp bindCraig Gallek2016-02-241-0/+1
* Merge branch 'dsa-pass-bridge-to-drivers'David S. Miller2016-02-237-99/+102
|\
| * net: dsa: remove dsa_bridge_check_vlan_rangeVivien Didelot2016-02-231-50/+0
| * net: dsa: mv88e6xxx: check hardware VLAN in useVivien Didelot2016-02-231-0/+64
| * net: dsa: pass bridge down to driversVivien Didelot2016-02-237-46/+30
| * net: dsa: mv88e6xxx: add port private structureVivien Didelot2016-02-232-3/+8
|/
* Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2016-02-2319-330/+322
|\
| * batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_putSven Eckelmann2016-02-231-6/+6
| * batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_putSven Eckelmann2016-02-231-16/+16
| * batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_putSven Eckelmann2016-02-231-14/+14
| * batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_putSven Eckelmann2016-02-233-10/+10
| * batman-adv: Rename batadv_nc_path *_free_ref function to *_putSven Eckelmann2016-02-231-6/+6