summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l2tp: define parameters of l2tp_session_get*() as "const"Guillaume Nault2017-04-122-5/+7
* Merge branch 'ftgmac100-rework-batch4-misc'David S. Miller2017-04-123-123/+247
|\
| * ftgmac100: Set default ring sizes to 128 entriesBenjamin Herrenschmidt2017-04-121-2/+2
| * ftgmac100: Make ring sizes configurable via ethtoolBenjamin Herrenschmidt2017-04-121-56/+148
| * ftgmac100: Add more register inits in ftgmac100_init_hw()Benjamin Herrenschmidt2017-04-121-0/+36
| * ftgmac100: Open code remaining register writesBenjamin Herrenschmidt2017-04-121-33/+20
| * ftgmac100: Rename ftgmac100_setup_mac to ftgmac100_initial_macBenjamin Herrenschmidt2017-04-121-2/+2
| * ftgmac100: Rename ftgmac100_set_mac to ftgmac100_write_mac_addrBenjamin Herrenschmidt2017-04-121-3/+3
| * ftgmac100: Set netdev->hw_featuresBenjamin Herrenschmidt2017-04-121-3/+4
| * ftgmac100: Disable HW checksum generation on AST2400, enable on othersBenjamin Herrenschmidt2017-04-123-10/+6
| * ftgmac100: Use device "compatible" property, not machine.Benjamin Herrenschmidt2017-04-123-11/+13
| * ftgmac100: Upgrade to NETIF_F_HW_CSUMBenjamin Herrenschmidt2017-04-121-15/+25
|/
* Merge branch 'net-smc-next'David S. Miller2017-04-1112-50/+87
|\
| * net/smc: do not use IB_SEND_INLINE together with mapped dataUrsula Braun2017-04-112-2/+1
| * net/smc: destruct non-accepted socketsUrsula Braun2017-04-112-6/+9
| * net/smc: remove duplicate unhashUrsula Braun2017-04-111-1/+0
| * net/smc: guarantee ConnClosed send after shutdown SHUT_WRUrsula Braun2017-04-111-11/+25
| * net/smc: no socket state changes in tasklet contextUrsula Braun2017-04-116-20/+41
| * net/smc: always call the POLL_IN part of sk_wake_asyncUrsula Braun2017-04-111-2/+1
| * net/smc: guarantee reset of write_blocked for heavy workloadUrsula Braun2017-04-111-1/+5
| * net/smc: return active RoCE port onlyUrsula Braun2017-04-111-2/+5
| * net/smc: remove useless smc_ib_devices_list checkUrsula Braun2017-04-113-4/+1
| * net/smc: get rid of old commentUrsula Braun2017-04-111-2/+0
|/
* net: stmmac: use netif_set_real_num_{rx,tx}_queuesJoao Pinto2017-04-111-2/+2
* bpf: pass sk to helper functionsWillem de Bruijn2017-04-112-2/+10
* devlink: fix return value check in devlink_dpipe_header_put()Wei Yongjun2017-04-111-1/+1
* Merge branch 's390-qeth-updates'David S. Miller2017-04-114-393/+268
|\
| * s390/qeth: remove unimplemented gdev routinesJulian Wiedmann2017-04-112-19/+2
| * s390/qeth: use LINK_MODE_* to report the link characteristicsJulian Wiedmann2017-04-111-24/+47
| * s390/qeth: convert to ETHTOOL_GLINKSETTINGS APIJulian Wiedmann2017-04-114-42/+40
| * s390/qeth: clean up qeth_set_ecmd_adv_sup()Julian Wiedmann2017-04-111-29/+28
| * s390/qeth: use and remove some definesJulian Wiedmann2017-04-112-3/+2
| * s390/qeth: use correct return type for hard_start_xmit()Julian Wiedmann2017-04-112-2/+4
| * s390/qeth: remove unused parameterJulian Wiedmann2017-04-114-5/+4
| * s390/qeth: move gdev shutdown handler to coreJulian Wiedmann2017-04-114-27/+6
| * s390/qeth: move NAPI poll routine to coreJulian Wiedmann2017-04-114-169/+97
| * s390/qeth: move common ioctl handling to coreJulian Wiedmann2017-04-114-99/+64
|/
* bpf: remove struct bpf_map_type_listJohannes Berg2017-04-117-165/+53
* bpf: remove struct bpf_prog_type_listJohannes Berg2017-04-115-122/+44
* Merge branch 'fec-driver-code-clean'David S. Miller2017-04-111-17/+28
|\
| * net: fec: add ERR007885 for i.MX6ul enet IPFugang Duan2017-04-111-2/+3
| * net: fec: correct the errata number comment typoFugang Duan2017-04-111-1/+1
| * net: fec: add phy-reset-gpios PROBE_DEFER checkFugang Duan2017-04-111-8/+18
| * net: fec: pass ->dev to dma_alloc__coherent() APIFugang Duan2017-04-111-2/+2
| * net: fec: avoid BD pointer type cast to 32bitFugang Duan2017-04-111-2/+2
| * net: fec: add return value check after calling .of_property_read_u32()Fugang Duan2017-04-111-2/+2
|/
* Merge branch 'l2tp-drop-l2tp_session_find'David S. Miller2017-04-113-58/+1
|\
| * l2tp: remove l2tp_session_find()Guillaume Nault2017-04-112-53/+1
| * l2tp: remove useless duplicate session detection in l2tp_netlinkGuillaume Nault2017-04-111-5/+0
|/
* Merge branch 'net-remove-pci_enable_msix'David S. Miller2017-04-1110-253/+112
|\