summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* qlcnic: VF reset recovery implementation.Rajesh Borundia2013-04-198-43/+440
* qlcnic: VF FLR implementation.Rajesh Borundia2013-04-194-18/+320
* qlcnic: Change 82xx adapter VLAN id endian type.Rajesh Borundia2013-04-197-30/+25Star
* Merge branch 'netlink-mmap'David S. Miller2013-04-1921-74/+1331
|\
| * nfnetlink: add support for memory mapped netlinkPatrick McHardy2013-04-194-5/+17
| * netfilter: rename netlink related "pid" variables to "portid"Patrick McHardy2013-04-196-21/+23
| * netlink: add documentation for memory mapped I/OPatrick McHardy2013-04-191-0/+339
| * netlink: add RX/TX-ring support to netlink diagPatrick McHardy2013-04-192-0/+42
| * netlink: add flow control for memory mapped I/OPatrick McHardy2013-04-191-27/+61
| * netlink: implement memory mapped recvmsg()Patrick McHardy2013-04-192-3/+143
| * netlink: implement memory mapped sendmsg()Patrick McHardy2013-04-191-6/+129
| * netlink: add mmap'ed netlink helper functionsPatrick McHardy2013-04-192-2/+190
| * netlink: mmaped netlink: ring setupPatrick McHardy2013-04-194-2/+327
| * netlink: add netlink_skb_set_owner_r()Patrick McHardy2013-04-191-3/+17
| * netlink: don't orphan skb in netlink_trim()Patrick McHardy2013-04-191-1/+1
| * net: add function to allocate sk_buff head without data areaPatrick McHardy2013-04-192-1/+35
| * netlink: rename ssk to sk in struct netlink_skb_paramsPatrick McHardy2013-04-196-9/+9
| * netlink: add symbolic value for congested statePatrick McHardy2013-04-191-7/+11
|/
* Merge branch '8021ad'David S. Miller2013-04-19101-566/+726
|\
| * net: vlan: announce STAG offload capability in some driversPatrick McHardy2013-04-193-3/+5
| * net: vlan: add 802.1ad supportPatrick McHardy2013-04-198-16/+61
| * net: vlan: add protocol argument to packet tagging functionsPatrick McHardy2013-04-1956-84/+107
| * net: vlan: prepare for 802.1ad supportPatrick McHardy2013-04-1912-84/+108
| * net: vlan: prepare for 802.1ad VLAN filtering offloadPatrick McHardy2013-04-1934-137/+184
| * 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-1912-36/+251
| * igb: add support for spoofchk configLior Levy2013-04-192-0/+35
| * igb: Enable EEE LP advertisementMatthew Vick2013-04-197-1/+142
| * igb: Fix code comments and whitespaceJeff Kirsher2013-04-1916-1183/+1010Star
| * igb: Fix sparse warnings on function pointersAkeem G. Abodunrin2013-04-191-2/+2
| * igb: Use rx/tx_itr_setting when setting up initial value of itrAlexander Duyck2013-04-191-0/+11
| * igb: Pull adapter out of main path in igb_xmit_frame_ringAlexander Duyck2013-04-191-9/+11
| * igb: Mask off check of frag_off as we only want fragment offsetAlexander Duyck2013-04-191-1/+1
| * igb: random code and comments fixAkeem G. Abodunrin2013-04-193-6/+5Star
| * igb: Implement support to power sfp cage and turn on I2CAkeem G. Abodunrin2013-04-191-1/+2
| * igb: Support to read and export SFF-8472/8079 dataAkeem G. Abodunrin2013-04-192-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/+5Star
| * 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-181-1/+1
| * ixgbe: Fix 1G link WoLDon Skidmore2013-04-183-2/+8
| * ixgbe: fix MNG FW support when adapter not upDon Skidmore2013-04-185-5/+65
| * ixgbe: enable devices with internal switch to read pci parentJacob Keller2013-04-181-0/+48
| * ixgbe: create conversion functions from link_status to bus/speedJacob Keller2013-04-182-32/+34
| * ixgbe: Enable support for recognizing PCI-e Gen3 link speedJacob Keller2013-04-183-1/+7
| * ixgbe: Drop check for PAGE_SIZE from ixgbe_xmit_frame_ringAlexander Duyck2013-04-181-6/+1Star
| * ixgbe: don't do arithmetic operations on bitmasksEmil Tantilov2013-04-181-1/+1