summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bonding: fix vlan_features computingMichal Kubeček2014-05-221-0/+1
* vlan: more careful checksum features handlingMichal Kubeček2014-05-222-2/+16
* net: fec: correct the MDIO clock sourceNimrod Andy2014-05-221-1/+1
* net: fec: optimize the clock management to save powerNimrod Andy2014-05-221-64/+56
* Merge branch 'sw_tso'David S. Miller2014-05-225-78/+492
|\
| * net: mv643xx_eth: Implement software TSOEzequiel Garcia2014-05-221-4/+160
| * net: mv643xx_eth: Use dma_map_single() to map the skb fragmentsEzequiel Garcia2014-05-221-12/+6
| * net: mv643xx_eth: Factorize feature settingEzequiel Garcia2014-05-221-3/+5
| * net: mv643xx_eth: Avoid setting the initial TCP checksumEzequiel Garcia2014-05-221-3/+6
| * net: mv643xx_eth: Factorize initial checksum and command preparationEzequiel Garcia2014-05-221-48/+65
| * net: mvneta: Implement software TSOEzequiel Garcia2014-05-221-1/+152
| * net: mvneta: Clean mvneta_tx() sk_buff handlingEzequiel Garcia2014-05-221-8/+7
| * net: mvneta: Factorize feature settingEzequiel Garcia2014-05-221-2/+2
| * net: Add a software TSO helper APIEzequiel Garcia2014-05-223-1/+93
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftablesDavid S. Miller2014-05-2213-472/+1407
|\
| * netfilter: nf_tables: defer all object release via rcuPablo Neira Ayuso2014-05-192-39/+56
| * netfilter: nf_tables: remove skb and nlh from context structurePablo Neira Ayuso2014-05-192-59/+52
| * netfilter: nf_tables: simplify nf_tables_*_notifyPablo Neira Ayuso2014-05-191-58/+32
| * netfilter: nf_tables: use new transaction infrastructure to handle elementsPablo Neira Ayuso2014-05-192-14/+78
| * netfilter: nf_tables: use new transaction infrastructure to handle tablePablo Neira Ayuso2014-05-192-19/+136
| * netfilter: nf_tables: pass context to nf_tables_updtable()Pablo Neira Ayuso2014-05-191-25/+26
| * netfilter: nf_tables: disabling table hooks always succeedsPablo Neira Ayuso2014-05-191-6/+3
| * netfilter: nf_tables: use new transaction infrastructure to handle chainPablo Neira Ayuso2014-05-192-45/+175
| * netfilter: nf_tables: refactor chain statistic routinesPablo Neira Ayuso2014-05-191-21/+24
| * netfilter: nf_tables: use new transaction infrastructure to handle setsPablo Neira Ayuso2014-05-194-18/+133
| * netfilter: nf_tables: add message type to transactionsPablo Neira Ayuso2014-05-192-31/+45
| * netfilter: nf_tables: relocate commit and abort routines in the source filePablo Neira Ayuso2014-05-191-80/+80
| * netfilter: nf_tables: generalise transaction infrastructurePablo Neira Ayuso2014-05-192-58/+80
| * netfilter: nf_tables: deconstify table and chain in context structurePablo Neira Ayuso2014-05-192-32/+32
| * netfilter: nf_tables: relax string validation of NFTA_CHAIN_TYPEPablo Neira2014-04-281-1/+1
| * netfilter: nf_tables: Add meta expression key for bridge interface nameTomasz Bursztyka2014-04-245-2/+158
| * netfilter: nf_tables: Make meta expression core functions publicTomasz Bursztyka2014-04-232-25/+61
| * netfilter: nf_tables: Stack expression type depending on their familyTomasz Bursztyka2014-04-231-1/+4
| * netfilter: nf_tables: handle more than 8 * PAGE_SIZE set name allocationsPatrick McHardy2014-04-141-5/+10
| * netfilter: nf_tables: add set_elem notificationsArturo Borrero2014-04-031-0/+82
| * netfilter: nft_hash: use set global element counter instead of private onePatrick McHardy2014-04-021-7/+2
| * netfilter: nf_tables: implement proper set selectionPatrick McHardy2014-04-025-18/+242
| * netfilter: nft_ct: split nft_ct_init() into two functions for get/setPatrick McHardy2014-04-021-53/+43
| * netfilter: nft_meta: split nft_meta_init() into two functions for get/setPatrick McHardy2014-04-021-35/+30
| * netfilter: nft_ct: add missing ifdef for NFT_MARK settingPatrick McHardy2014-04-021-0/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-05-2226-146/+179
|\ \
| * | i40e: fix passing wrong error code to i40e_open()Jean Sacren2014-05-211-1/+1
| * | i40evf: Use pci_enable_msix_range() instead of pci_enable_msix()Alexander Gordeev2014-05-211-20/+11
| * | i40e: Check PCI_IOV config to avoid compile errorGreg Rose2014-05-211-0/+2
| * | i40e: remove Tx work for ptpJesse Brandeburg2014-05-212-2/+0
| * | i40e: Don't disable SR-IOV when VFs are assignedMitch Williams2014-05-211-1/+10
| * | i40e: remove hardcode of stats struct size in ethtoolShannon Nelson2014-05-211-2/+3
| * | i40e/i40evf: control auto ITR through ethtoolMitch Williams2014-05-212-70/+52
| * | i40e/i40evf: set proper default for ITR registersMitch Williams2014-05-212-2/+8
| * | i40evf: make ethtool_ops constMitch Williams2014-05-211-1/+1
OpenPOWER on IntegriCloud