summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net sched actions: change IFE modules alias namesRoman Mashak2017-10-125-5/+5
* vxge: Clean up unused variables in vxge-trafficChristos Gkekas2017-10-121-19/+0
* sched: tc_mirred: Remove whitespacesFlorian Fainelli2017-10-121-3/+3
* ip_tunnel: fix building with NET_IP_TUNNEL=mArnd Bergmann2017-10-121-0/+1
* Merge branch 'smc-ib_query_gid'David S. Miller2017-10-122-21/+17
|\
| * net/smc: dev_put for netdev after usage of ib_query_gid()Ursula Braun2017-10-121-4/+8
| * net/smc: replace function pointer get_netdev()Ursula Braun2017-10-121-17/+9
|/
* Merge branch 'dsa-ACB-for-bcm_sf2-and-bcmsysport'David S. Miller2017-10-128-5/+270
|\
| * net: systemport: Turn on ACB at the SYSTEMPORT levelFlorian Fainelli2017-10-121-1/+5
| * net: dsa: bcm_sf2: Turn on ACB at the switch levelFlorian Fainelli2017-10-122-0/+53
| * net: systemport: Establish lower/upper queue mappingFlorian Fainelli2017-10-122-5/+121
| * net: dsa: tag_brcm: Indicate to master netdevice port + queueFlorian Fainelli2017-10-122-0/+11
| * net: dsa: Add support for DSA specific notifiersFlorian Fainelli2017-10-123-0/+81
|/
* Revert "net: qcom/emac: enforce DMA address restrictions"Timur Tabi2017-10-121-24/+15
* tcp: remove obsolete helpersEric Dumazet2017-10-121-17/+0
* bpf: remove redundant variable old_flagsColin Ian King2017-10-111-2/+0
* Merge branch 'mlx4-XDP-TX-improvements'David S. Miller2017-10-114-17/+36
|\
| * net/mlx4_en: XDP_TX, assign constant values of TX descs on ring creaionTariq Toukan2017-10-113-14/+27
| * net/mlx4_en: Obsolete call to generic write_desc in XDP xmit flowTariq Toukan2017-10-111-5/+12
| * net/mlx4_en: Replace netdev parameter with priv in XDP xmit functionTariq Toukan2017-10-113-4/+3
|/
* net: mpls: make function ipgre_mpls_encap_hlen staticColin Ian King2017-10-111-1/+1
* sctp: make array sctp_sched_ops staticColin Ian King2017-10-111-1/+1
* ipv6: addrconf: don't use rtnl mutex in RTM_GETADDRFlorian Westphal2017-10-111-7/+7
* ipv6: addrconf: don't use rtnl mutex in RTM_GETNETCONFFlorian Westphal2017-10-111-10/+14
* Merge branch 'net-sched-get-rid-of-cls_flower-egress_dev'David S. Miller2017-10-1110-65/+348
|\
| * net: sched: remove unused tcf_exts_get_dev helper and cls_flower->egress_devJiri Pirko2017-10-112-25/+0
| * net: sched: convert cls_flower->egress_dev users to tc_setup_cb_egdev infraJiri Pirko2017-10-116-46/+73
| * net: sched: introduce per-egress action device callbacksJiri Pirko2017-10-114-0/+286
| * net: sched: make tc_action_ops->get_dev return dev and avoid passing netJiri Pirko2017-10-114-14/+9
|/
* Merge branch 'rmnet-Rewrite-some-existing-functionality'David S. Miller2017-10-118-173/+207
|\
| * net: qualcomm: rmnet: Implement bridge modeSubash Abhinov Kasiviswanathan2017-10-114-6/+122
| * net: qualcomm: rmnet: Convert the muxed endpoint to hlistSubash Abhinov Kasiviswanathan2017-10-116-53/+68
| * net: qualcomm: rmnet: Remove duplicate setting of rmnet_devicesSubash Abhinov Kasiviswanathan2017-10-112-5/+4
| * net: qualcomm: rmnet: Remove duplicate setting of rmnet private infoSubash Abhinov Kasiviswanathan2017-10-116-40/+15
| * net: qualcomm: rmnet: Move rmnet_mode to rmnet_portSubash Abhinov Kasiviswanathan2017-10-113-10/+7
| * net: qualcomm: rmnet: Remove some unused definesSubash Abhinov Kasiviswanathan2017-10-111-8/+0
| * net: qualcomm: rmnet: Remove existing logic for bridge modeSubash Abhinov Kasiviswanathan2017-10-112-69/+9
|/
* Merge branch 'qcom-emac-various-minor-fixes'David S. Miller2017-10-113-54/+41
|\
| * net: qcom/emac: clean up some TX/RX error messagesTimur Tabi2017-10-112-13/+10
| * net: qcom/emac: enforce DMA address restrictionsTimur Tabi2017-10-111-15/+24
| * net: qcom/emac: remove unused address arraysTimur Tabi2017-10-111-13/+3
| * net: qcom/emac: specify the correct DMA maskTimur Tabi2017-10-111-13/+4
|/
* Merge branch 'qrtr-Fixes-and-support-receiving-version-2-packets'David S. Miller2017-10-112-171/+241
|\
| * net: qrtr: Support decoding incoming v2 packetsBjorn Andersson2017-10-111-38/+94
| * net: qrtr: Use sk_buff->cb in receive pathBjorn Andersson2017-10-111-30/+40
| * net: qrtr: Clean up control packet handlingBjorn Andersson2017-10-111-64/+29
| * net: qrtr: Pass source and destination to enqueue functionsBjorn Andersson2017-10-111-51/+69
| * net: qrtr: Add control packet definition to uapiBjorn Andersson2017-10-112-12/+32
| * net: qrtr: Move constants to header fileBjorn Andersson2017-10-112-2/+3
| * net: qrtr: Invoke sk_error_report() after setting sk_errBjorn Andersson2017-10-111-1/+1
|/