summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*Patrick McHardy2013-04-1978-266/+285
* Merge branch 'intel'David S. Miller2013-04-1921-1256/+1604
|\
| * igb: Add support for i354 devicesCarolyn Wyborny2013-04-1812-36/+251
| * igb: add support for spoofchk configLior Levy2013-04-182-0/+35
| * igb: Enable EEE LP advertisementMatthew Vick2013-04-187-1/+142
| * igb: Fix code comments and whitespaceJeff Kirsher2013-04-1816-1183/+1010
| * igb: Fix sparse warnings on function pointersAkeem G. Abodunrin2013-04-181-2/+2
| * igb: Use rx/tx_itr_setting when setting up initial value of itrAlexander Duyck2013-04-181-0/+11
| * igb: Pull adapter out of main path in igb_xmit_frame_ringAlexander Duyck2013-04-181-9/+11
| * igb: Mask off check of frag_off as we only want fragment offsetAlexander Duyck2013-04-181-1/+1
| * igb: random code and comments fixAkeem G. Abodunrin2013-04-183-6/+5
| * igb: Implement support to power sfp cage and turn on I2CAkeem G. Abodunrin2013-04-181-1/+2
| * igb: Support to read and export SFF-8472/8079 dataAkeem G. Abodunrin2013-04-182-0/+89
| * igb: Support for 100base-fx SFPAkeem G. Abodunrin2013-04-183-19/+50
| * ixgbe: Remove unnecessary #ifdef CONFIG_DEBUG_FS testsJoe Perches2013-04-182-10/+5
| * ixgbe: Add support for WoL on 82599 SFP+ LOMJacob Keller2013-04-182-0/+2
| * ixgbe: in shutdown, do netif_running() under rtnl_lockakepner2013-04-181-2/+2
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2013-04-187-45/+162
|\
| * ixgbe: bump version numberDon Skidmore2013-04-171-1/+1
| * ixgbe: Fix 1G link WoLDon Skidmore2013-04-173-2/+8
| * ixgbe: fix MNG FW support when adapter not upDon Skidmore2013-04-175-5/+65
| * ixgbe: enable devices with internal switch to read pci parentJacob Keller2013-04-171-0/+48
| * ixgbe: create conversion functions from link_status to bus/speedJacob Keller2013-04-172-32/+34
| * ixgbe: Enable support for recognizing PCI-e Gen3 link speedJacob Keller2013-04-173-1/+7
| * ixgbe: Drop check for PAGE_SIZE from ixgbe_xmit_frame_ringAlexander Duyck2013-04-171-6/+1
| * ixgbe: don't do arithmetic operations on bitmasksEmil Tantilov2013-04-171-1/+1
| * ixgbe: Mask off check of frag_off as we only want fragment offsetAlexander Duyck2013-04-171-1/+1
* | tcp: introduce TCPSpuriousRtxHostQueues SNMP counterEric Dumazet2013-04-183-0/+9
* | fec: Remove unneeded asm header filesFabio Estevam2013-04-181-5/+0
|/
* Merge branch 'tipc-ipoib'David S. Miller2013-04-1710-42/+438
|\
| * IPoIB: add support for TIPC protocolPatrick McHardy2013-04-171-1/+3
| * tipc: add InfiniBand media typePatrick McHardy2013-04-176-3/+416
| * tipc: set skb->protocol in eth_media packet transmissionPatrick McHardy2013-04-171-0/+1
| * tipc: move bcast_addr from struct tipc_media to struct tipc_bearerPatrick McHardy2013-04-175-16/+18
| * tipc: remove unused str2addr media callbackPatrick McHardy2013-04-172-22/+0
|/
* net: cdc_ether: silence sparse __CHECK_ENDIAN__ warningBjørn Mork2013-04-171-1/+1
* net: sctp: sctp_ulpq: remove 'malloced' struct memberDaniel Borkmann2013-04-172-4/+0
* net: sctp: sctp_bind_addr: remove dead codeDaniel Borkmann2013-04-172-9/+0
* net: sctp: sctp_transport: remove unused variableDaniel Borkmann2013-04-172-5/+1
* net: sctp: outqueue: simplify sctp_outq_uncork functionDaniel Borkmann2013-04-171-3/+2
* net: sctp: sctp_outq: remove 'malloced' from its structDaniel Borkmann2013-04-172-9/+0
* net: sctp: sctp_inq: remove dead codeDaniel Borkmann2013-04-172-9/+0
* net: sctp: sctp_ssnmap: remove 'malloced' element from structDaniel Borkmann2013-04-172-12/+12
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2013-04-1712-695/+849
|\
| * openvswitch: Use generic struct pcpu_tstats.Pravin B Shelar2013-04-152-20/+13
| * openvswitch: Simplify datapath locking.Pravin B Shelar2013-04-157-167/+298
| * openvswitch: datapath.h: Fix a stale comment.Andy Zhou2013-04-101-1/+0
| * openvswitch: Don't insert empty OVS_VPORT_ATTR_OPTIONS attributeThomas Graf2013-04-021-6/+8
| * openvswitch: Expose <linux/openvswitch.h> to userspaceThomas Graf2013-03-293-432/+458
| * openvswitch: Use ETH_ALEN to define ethernet addressesThomas Graf2013-03-291-6/+7
OpenPOWER on IntegriCloud