summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cxgb4-next'David S. Miller2015-06-0213-172/+932
|\
| * cxgb4vf: Adds SRIOV driver changes for T6 adapterHariprasad Shenai2015-06-023-23/+54
| * cxgb4: Adds support for T6 adapterHariprasad Shenai2015-06-0210-149/+524
| * cxgb4: Add is_t6 macro and T6 register rangesHariprasad Shenai2015-06-022-0/+354
|/
* geneve: allow user to specify TOS info for tunnel framesJohn W. Linville2015-06-022-4/+15
* geneve: allow user to specify TTL for tunnel framesJohn W. Linville2015-06-022-4/+15
* Merge branch 'rocker-next'David S. Miller2015-06-021-55/+50
|\
| * rocker: remove support for legacy VLAN ndo opsScott Feldman2015-06-021-33/+1
| * rocker: install/remove router MAC for untagged VLAN when joining/leaving bridgeScott Feldman2015-06-021-17/+25
| * rocker: install untagged VLAN (vid=0) support for each portScott Feldman2015-06-021-3/+17
| * rocker: cleanup vlan table on error adding vlanScott Feldman2015-06-021-1/+6
| * rocker: zero allocate ports arrayScott Feldman2015-06-021-1/+1
|/
* vlan: Add GRO support for non hardware accelerated vlanToshiaki Makita2015-06-022-0/+116
* cxgb4: remove unused fn to enable/disable db coalescingHariprasad Shenai2015-06-022-21/+0
* rocker: remove rocker parameter from functions that have rocker_port parameterSimon Horman2015-06-021-70/+45
* bnx2x: Alloc 4k fragment for each rx ring buffer elementGabriel Krisman Bertazi2015-06-023-24/+80
* openvswitch: include datapath actions with sampled-packet upcall to userspaceNeil McKee2015-06-024-10/+37
* net: Add priority to packet_offload objects.David S. Miller2015-06-014-2/+10
* xen-netfront: Use setup_timerVaishali Thakkar2015-06-011-3/+2
* Merge branch 'rds-next'David S. Miller2015-06-015-5/+77
|\
| * net/rds Add getsockopt support for SO_RDS_TRANSPORTSowmini Varadhan2015-06-011-0/+14
| * net/rds: Add setsockopt support for SO_RDS_TRANSPORTSowmini Varadhan2015-06-014-0/+53
| * net/rds: Declare SO_RDS_TRANSPORT and RDS_TRANS_* constants in uapi/linux/rds.hSowmini Varadhan2015-06-012-5/+10
|/
* ethernet/intel: Use setup_timerVaishali Thakkar2015-06-011-3/+1
* ebpf: misc core cleanupDaniel Borkmann2015-06-012-48/+58
* ebpf: allow bpf_ktime_get_ns_proto also for networkingDaniel Borkmann2015-06-015-12/+17
* isdn/capi: Use setup_timerVaishali Thakkar2015-06-011-3/+1
* net: dl2k: Use setup_timerVaishali Thakkar2015-06-011-3/+1
* net: mv643xx_eth: Use setup_timerVaishali Thakkar2015-06-011-6/+3
* Merge tag 'mac80211-next-for-davem-2015-05-29' of git://git.kernel.org/pub/sc...David S. Miller2015-06-0124-54/+105
|\
| * net: rfkill: gpio: make better use of gpiod APIUwe Kleine-König2015-05-291-14/+10
| * cfg80211: ignore netif running state when changing iftypeMichal Kazior2015-05-291-1/+1
| * mac80211: prevent possible crypto tx tailroom corruptionMichal Kazior2015-05-291-0/+3
| * cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnectJohannes Berg2015-05-2616-27/+37
| * mac80211: disconnect TDLS stations on STA CSAArik Nemtsov2015-05-202-0/+32
| * mac80211: check fast-xmit on station changeMichal Kazior2015-05-201-0/+1
| * mac80211: add missing drv_priv description for TXQ structJohannes Berg2015-05-201-0/+1
| * cfg80211: Switch to PM opsLars-Peter Clausen2015-05-201-6/+8
| * net: rfkill: Switch to PM opsLars-Peter Clausen2015-05-201-3/+9
| * mac80211: fix memory leakJohannes Berg2015-05-201-1/+3
* | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2015-05-3143-137/+165
|\ \
| * | batman-adv: Use common declaration order in *_send_skb_(packet|unicast)Antonio Quartulli2015-05-291-1/+1
| * | batman-adv: iv_ogm_orig_update, remove unnecessary bracketsMarkus Pargmann2015-05-291-1/+1
| * | batman-adv: iv_ogm_can_aggregate, code readabilityMarkus Pargmann2015-05-291-49/+53
| * | batman-adv: checkpatch - spaces preferred around that '*'Marek Lindner2015-05-292-2/+2
| * | batman-adv: checkpatch - comparison to NULL could be rewrittenMarek Lindner2015-05-291-1/+1
| * | batman-adv: Use safer default config for optional featuresSven Eckelmann2015-05-292-2/+2
| * | batman-adv: iv_ogm_send_to_if, declare char* as constMarkus Pargmann2015-05-291-1/+1
| * | batman-adv: iv_ogm_aggr_packet, bool return valueMarkus Pargmann2015-05-291-2/+2
| * | batman-adv: iv_ogm_iface_enable, direct return valuesMarkus Pargmann2015-05-291-6/+2