summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* pktgen: fix out-of-bounds access in pgctrl_write()Mathias Krause2014-02-241-1/+4
| | | | | | | | | | | | | | | If a privileged user writes an empty string to /proc/net/pktgen/pgctrl the code for stripping the (then non-existent) '\n' actually writes the zero byte at index -1 of data[]. The then still uninitialized array will very likely fail the command matching tests and the pr_warning() at the end will therefore leak stack bytes to the kernel log. Fix those issues by simply ensuring we're passed a non-empty string as the user API apparently expects a trailing '\n' for all commands. Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'qlcnic-next'David S. Miller2014-02-2411-149/+349
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shahed Shaikh says: ==================== qlcnic: Re-factoring and enhancements This patch series includes following changes - * Re-factored firmware minidump template header handling * Support to make 8 vNIC mode application to work with 16 vNIC mode * Enhance error message logging when adapter is in failed state and when adapter lock access fails. * Allow vlan0 traffic * update MAINTAINERS Please apply this series to net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * Update MAINTAINERS for qlcnic driverShahed Shaikh2014-02-241-6/+1
| | | | | | | | | | | | | | | | Keep myself as only maintainer for qlcnic driver and update group email alias to Dept-HSGLinuxNICDev@qlogic.com Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Update version to 5.3.56Shahed Shaikh2014-02-241-2/+2
| | | | | | | | | | Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Enhance semaphore lock access failure error messageHarish Patil2014-02-241-7/+15
| | | | | | | | | | Signed-off-by: Harish Patil <harish.patil@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Allow vlan0 trafficRajesh Borundia2014-02-241-1/+5
| | | | | | | | | | | | | | | | o Adapter allows vlan0 traffic in case of SR-IOV after setting QLC_SRIOV_ALLOW_VLAN0 bit even though we do not add vlan0 filters. Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Enhance driver message in failed state.Sucheta Chakraborty2014-02-241-2/+2
| | | | | | | | | | Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Updates to QLogic application/driver interface for virtual NIC ↵Jitendra Kalsaria2014-02-241-65/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration Qlogic application interface in the driver which has larger than 8 vNIC configuration support has been updated to handle the following cases: o Only 8 or lower total vNICs were enabled within the vNIC 0-7 range o vNICs were enabled in the vNIC 0-15 range such that enabled vNICs were not contiguous and only 8 or lower number of total VNICs were enabled o Disconnect in the vNIC mapping between application and driver when the enabled VNICs were dis contiguous Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Re-factor firmware minidump template header handlingShahed Shaikh2014-02-247-66/+287
|/ | | | | | | | Treat firmware minidump template headers for 82xx and 83xx/84xx adapters separately, as it may change for 82xx and 83xx/84xx adapter type independently. Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'mlx4'David S. Miller2014-02-244-16/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amir Vadai says: ==================== net/mlx4: Mellanox driver update 01-01-2014 This small patchset has a fix to a bogus usage of netif_get_num_default_rss_queues() in mlx4_en driver. Changes from V1: - Removed affinity_hint patch, to make it a generic instead of mlx specific Changes from V0: - Instead of reverting the netif_get_num_default_rss_queues() in mlx4_en, fixing it to limit the actual number of receive queues instead of limiting the number of IRQ's. Patchset was applied and tested against commit: cb6e926 "ipv6:fix checkpatch errors with assignment in if condition" ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * net/mlx4: Fix limiting number of IRQ's instead of RSS queuesIdo Shamay2014-02-242-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix a performance bug introduced by commit 90b1ebe "mlx4: set maximal number of default RSS queues", which limits the numbers of IRQs opened by core module. The limit should be on the number of queues in the indirection table - rx_rings, and not on the number of IRQ's. Also, limiting on mlx4_core initialization instead of in mlx4_en, prevented using "ethtool -L" to utilize all the CPU's, when performance mode is prefered, since limiting this number to 8 reduces overall packet rate by 15%-50% in multiple TCP streams applications. For example, after running ethtool -L <ethx> rx 16 Packet rate Before the fix 897799 After the fix 1142070 Results were obtained using netperf: S=200 ; ( for i in $(seq 1 $S) ; do ( \ netperf -H 11.7.13.55 -t TCP_RR -l 30 &) ; \ wait ; done | grep "1 1" | awk '{SUM+=$6} END {print SUM}' ) CC: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Ido Shamay <idos@mellanox.com> Signed-off-by: Amir Vadai <amirv@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * net/mlx4: Set number of RX rings in a utility functionIdo Shamay2014-02-243-14/+25
|/ | | | | | | | | | mlx4_en_add() is too long. Moving set number of RX rings to a utiltity function to improve readability and modulization of the code. Signed-off-by: Ido Shamay <idos@mellanox.com> Signed-off-by: Amir Vadai <amirv@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bonding: remove no longer needed lock for bond_xxx_info_query()dingtianhong2014-02-241-4/+0
| | | | | | | | | | | The bond_xxx_info_query() was already in RTNL, so no need to use bond lock to protect the bond slave list, so remove it. Cc: Jay Vosburgh <fubar@us.ibm.com> Cc: Veaceslav Falico <vfalico@redhat.com> Cc: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bonding: use rcu_dereference() to access curr_active_slavedingtianhong2014-02-241-3/+1
| | | | | | | | | | | | | The bond_info_show_master already in RCU read-side critical section, and the we access curr_active_slave without the curr_slave_lock, we could not sure whether the curr_active_slave will be changed during the processing, so use RCU to protected the pointer. Cc: Jay Vosburgh <fubar@us.ibm.com> Cc: Veaceslav Falico <vfalico@redhat.com> Cc: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bonding: netpoll: remove unwanted slave_dev_support_netpoll()dingtianhong2014-02-241-8/+0
| | | | | | | | | | | | The __netpoll_setup() will check the slave's flag and ndo_poll_controller just like the slave_dev_support_netpoll() does, and slave_dev_support_netpoll() was not used by any place, so remove it. Cc: Jay Vosburgh <fubar@us.ibm.com> Cc: Veaceslav Falico <vfalico@redhat.com> Cc: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2014-02-2417-149/+396
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next Steffen Klassert says: ==================== 1) Introduce skb_to_sgvec_nomark function to add further data to the sg list without calling sg_unmark_end first. Needed to add extended sequence number informations. From Fan Du. 2) Add IPsec extended sequence numbers support to the Authentication Header protocol for ipv4 and ipv6. From Fan Du. 3) Make the IPsec flowcache namespace aware, from Fan Du. 4) Avoid creating temporary SA for every packet when no key manager is registered. From Horia Geanta. 5) Support filtering of SA dumps to show only the SAs that match a given filter. From Nicolas Dichtel. 6) Remove caching of xfrm_policy_sk_bundles. The cached socket policy bundles are never used, instead we create a new cache entry whenever xfrm_lookup() is called on a socket policy. Most protocols cache the used routes to the socket, so this caching is not needed. 7) Fix a forgotten SADB_X_EXT_FILTER length check in pfkey, from Nicolas Dichtel. 8) Cleanup error handling of xfrm_state_clone. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * xfrm: Cleanup error handling of xfrm_state_cloneSteffen Klassert2014-02-211-11/+5
| | | | | | | | | | | | | | The error pointer passed to xfrm_state_clone() is unchecked, so remove it and indicate an error by returning a null pointer. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * pfkey: fix SADB_X_EXT_FILTER length checkNicolas Dichtel2014-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | This patch fixes commit d3623099d350 ("ipsec: add support of limited SA dump"). sadb_ext_min_len array should be updated with the new type (SADB_X_EXT_FILTER). Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * xfrm: Remove caching of xfrm_policy_sk_bundlesSteffen Klassert2014-02-192-29/+0
| | | | | | | | | | | | | | | | | | | | | | We currently cache socket policy bundles at xfrm_policy_sk_bundles. These cached bundles are never used. Instead we create and cache a new one whenever xfrm_lookup() is called on a socket policy. Most protocols cache the used routes to the socket, so let's remove the unused caching of socket policy bundles in xfrm. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * ipsec: add support of limited SA dumpNicolas Dichtel2014-02-176-9/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goal of this patch is to allow userland to dump only a part of SA by specifying a filter during the dump. The kernel is in charge to filter SA, this avoids to generate useless netlink traffic (it save also some cpu cycles). This is particularly useful when there is a big number of SA set on the system. Note that I removed the union in struct xfrm_state_walk to fix a problem on arm. struct netlink_callback->args is defined as a array of 6 long and the first long is used in xfrm code to flag the cb as initialized. Hence, we must have: sizeof(struct xfrm_state_walk) <= sizeof(long) * 5. With the union, it was false on arm (sizeof(struct xfrm_state_walk) was sizeof(long) * 7), due to the padding. In fact, whatever the arch is, this union seems useless, there will be always padding after it. Removing it will not increase the size of this struct (and reduce it on arm). Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * xfrm: avoid creating temporary SA when there are no listenersHoria Geanta2014-02-134-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case when KMs have no listeners, km_query() will fail and temporary SAs are garbage collected immediately after their allocation. This causes strain on memory allocation, leading even to OOM since temporary SA alloc/free cycle is performed for every packet and garbage collection does not keep up the pace. The sane thing to do is to make sure we have audience before temporary SA allocation. Signed-off-by: Horia Geanta <horia.geanta@freescale.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * flowcache: Bring net/core/flow.c under IPsec maintain scopeFan Du2014-02-121-0/+1
| | | | | | | | | | | | | | As flow cache is mainly manipulated from IPsec. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * flowcache: Make flow cache name space awareFan Du2014-02-126-77/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserting a entry into flowcache, or flushing flowcache should be based on per net scope. The reason to do so is flushing operation from fat netns crammed with flow entries will also making the slim netns with only a few flow cache entries go away in original implementation. Since flowcache is tightly coupled with IPsec, so it would be easier to put flow cache global parameters into xfrm namespace part. And one last thing needs to do is bumping flow cache genid, and flush flow cache should also be made in per net style. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * xfrm: Don't prohibit AH from using ESN featureFan Du2014-02-121-1/+2
| | | | | | | | | | | | | | | | Clear checking when user try to use ESN through netlink keymgr for AH. As only ESP and AH support ESN feature according to RFC. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * {IPv6,xfrm} Add ESN support for AH ingress partFan Du2014-02-121-6/+24
| | | | | | | | | | | | | | | | | | | | | | This patch add esn support for AH input stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302. Then the ICV value will guard upper 32bits sequence number as well when packet going in. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * {IPv6,xfrm} Add ESN support for AH egress partFan Du2014-02-121-5/+21
| | | | | | | | | | | | | | | | | | | | | | This patch add esn support for AH output stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302. Then the ICV value will guard upper 32bits sequence number as well when packet going out. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * {IPv4,xfrm} Add ESN support for AH ingress partFan Du2014-02-121-5/+22
| | | | | | | | | | | | | | | | | | | | | | This patch add esn support for AH input stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302. Then the ICV value will guard upper 32bits sequence number as well when packet getting in. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * {IPv4,xfrm} Add ESN support for AH egress partFan Du2014-02-121-6/+20
| | | | | | | | | | | | | | | | | | | | | | This patch add esn support for AH output stage by attaching upper 32bits sequence number right after packet payload as specified by RFC 4302. Then the ICV value will guard upper 32bits sequence number as well when packet going out. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * skbuff: Introduce skb_to_sgvec_nomark to map skb without mark new endFan Du2014-02-122-0/+28
| | | | | | | | | | | | | | | | | | | | As compared with skb_to_sgvec, skb_to_sgvec_nomark only map skb to given sglist without mark the sg which contain last skb data as the end. So the caller can mannipulate sg list as will when padding new data after the first call without calling sg_unmark_end to expend sg list. Signed-off-by: Fan Du <fan.du@windriver.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
* | Merge branch 'i40evf'David S. Miller2014-02-217-76/+85
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e and (mostly to) i40evf. Mitch provides most the work for this series. For the vf driver he requests a reset on a tx hang, removes vlan filtes on close since we already remove the MAC filters, fixes some crashes, gets rid of PCI DAC as it does not mean much on virtualized PCIe parts, skips assigning the device name that just gets renamed anyway, stores the descriptor ring size in a manner that allows the use of common tx and rx code with the PF driver and makes a handful of cosmetic fixes. For i40e he removes a delay left over from debugging and changes a do/while loop to a for loop to avoid hitting another delay each time. Catherine fixes inconsistent MSI and MSI-X messages and bumps the driver version. v2: Removed unnecessary periods and redundant OOM message. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40e and i40evf: Bump driver versionsCatherine Sullivan2014-02-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the driver versions. Change-ID: I3fe23024d17da0e614ce126edb365bb2c428d482 Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40e: Change MSIX to MSI-XCatherine Sullivan2014-02-212-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent use of MSIX and MSI-X in messages. Change-ID: Iae9ffb42819677c34544719044ed77632e06147d Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40e: tighten up ring enable/disable flowMitch Williams2014-02-211-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the do/while to a for loop, so we don't hit the delay each time, even when the register is ready for action. Don't bother to set or clear the QENA_STAT bit as it is read-only. Change-ID: Ie464718804dd79f6d726f291caa9b0c872b49978 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40e: remove unnecessary delayMitch Williams2014-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ain't nothing gonna break my stride, nobody's gonna slow me down, oh no. I got to keep on moving. This was originally put in for debugging just-in-case purposes and never removed. Change-ID: Ic12c2e179c3923f54e6ba0a9e4ab05d25c3bab29 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: remove errant spaceMitch A Williams2014-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a bogus space. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: update version and copyright dateMitch Williams2014-02-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bunch of changes merit a new version number, and since these were made in the new year, update the copyright date. Change-ID: Ic3f282bf0c20679b9fb06860211afa7c78055bc2 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: store ring size in ring structsMitch Williams2014-02-213-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the descriptor ring size in the actual ring structs instead of in the adapter struct. This enables us to use common tx and rx code with the i40e PF driver. Also update copyrights. Change-ID: I2861e599b2b4c76441c062ea14400f4750f54d0e Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: don't guess device nameMitch Williams2014-02-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to set an interface name here; the net core will do that, and then it will get renamed by udev anyway. Change-ID: I839a17837d19bedd1f490bff32ac5b85b4bfd97f Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: remove bogus commentMitch Williams2014-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment is simply not true. Change-ID: If006b02b60984601a24257a951ae873dff568008 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: fix up strings in init taskMitch Williams2014-02-211-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format. v2: Removed unnecessary periods and redundant OOM message. Change-ID: I50e443467519ad3850def131d84626c50612c611 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: get rid of pci_using_dacMitch Williams2014-02-211-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PCI DAC doesn't really mean much on a virtualized PCI Express part, so get rid of that check and just always set the HIGHDMA flag in the net device. Change-ID: I2040272be0e7934323f470c2bc73fbdd4f93e2b6 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: fix multiple crashes on removeMitch Williams2014-02-211-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending upon the state of the driver, there are several potential pitfalls on remove. Kill the watchdog task so rmmod doesn't hang. Check the adapter->msix_entries field, not the num_msix_vectors field, which is never cleared. Change-ID: I0546048477f09fc19e481bd37efa30daae4faa88 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: remove VLAN filters on closeMitch Williams2014-02-211-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We remove all the MAC filters, so remove the VLAN filters, too. Change-ID: I4f7559acdf005dc3f359bf6460ce32d183c8878b Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | i40evf: request reset on tx hangMitch Williams2014-02-213-3/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | If the kernel watchdog bites us, ask the PF to reset us and attempt to reinit the driver. Change-ID: Ic97665aeeed71ce712b9c4f057e78ff8372522b9 Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'for-davem' of ↵David S. Miller2014-02-20211-6336/+9921
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next John W. Linville says: ==================== Please pull this batch of wireless updates intended for the 3.15 stream! For the mac80211 bits, Johannes says: "We have some cleanups and minor fixes as well as userspace API improvements from a lot of people, extended VHT support for radiotap from Emmanuel, CSA improvements from Andrei, Luca and Michal. I've also included my work on hwsim to make dynamic registration of radios possible." Along with that, we get the usual round of updates to ath9k, brcmfmac, mwifiex, wcn36xx, and the ti drivers -- nothing particularly noteworthy, mostly just random updates and refactoring. Also included is a pull of the wireless tree, intended to resolve some potential merge issues. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * \ Merge branch 'master' of ↵John W. Linville2014-02-20211-6336/+9921
| |\ \ |/ / / | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
| * | Staging: rtl8812ae: remove modules field of rate_control_opsStephen Rothwell2014-02-131-1/+0
| | | | | | | | | | | | | | | | | | | | | This has been removed in further work. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | wcn36xx: Update dtim period before starting BSSPontus Fuchs2014-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The dtim period sent to FW was 0 because the dtim period was never set. This caused an incorrect dtim count to be sent in beacons. Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | wcn36xx: Track dpu signature per staPontus Fuchs2014-02-133-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | This fixes problems seen with multiple softap clients and reconnecting softap clients. Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | wcn36xx: Rename wcn36xx_vif.ucast_dpu_signature to self_ucast_dpu_signPontus Fuchs2014-02-133-3/+3
| | | | | | | | | | | | | | | | | | | | | This is more line with the names of the other members Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
OpenPOWER on IntegriCloud