summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'alb_learning'David S. Miller2014-03-152-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Veaceslav Falico says: ==================== bonding: use correct ether type for alb There have been reports that, while using the ETH_P_LOOP ether type (0x0060), the ether type is treated as its packet length. To avoid that and to not break already existing apps - add new ether type ETH_P_LOOPBACK that contains the correct id - 0x9000. ==================== Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
| * bonding: use the correct ether type for albVeaceslav Falico2014-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently it's using the wrong ETH_P_LOOP type, which is sometimes treated as packet length instead of ether type (because it's 0x0060). Use the new ETH_P_LOOPBACK type. CC: Jay Vosburgh <fubar@us.ibm.com> CC: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ether: add loopback type ETH_P_LOOPBACKVeaceslav Falico2014-03-151-0/+1
|/ | | | | | | | | | | | | | | | | | | | Per IEEE 802.3*, the correct packet type for loopback 0x9000. There's already one ETH_P_LOOP 0x0060, which has been there for ages, however it's plainly wrong as anything that small is considered a length field. We can't remove it because legacy, so add a new type which corresponds to the correct id. http://www.iana.org/assignments/ieee-802-numbers/ieee-802-numbers.xhtml CC: "David S. Miller" <davem@davemloft.net> CC: Stefan Richter <stefanr@s5r6.in-berlin.de> CC: Simon Wunderlich <sw@simonwunderlich.de> CC: Neil Jerram <Neil.Jerram@metaswitch.com> CC: Simon Horman <horms@verge.net.au> CC: Arvid Brodin <Arvid.Brodin@xdin.com> Signed-off-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2014-03-1510-95/+269
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to igb, i40e and i40evf. I provide a code comment fix which David Miller noticed in the last series of patches I submitted. Shannon provides a patch to cleanup the NAPI structs when deleting the netdev. Anjali provides several patches for i40e, first fixes a bug in the update filter logic which was causing a kernel panic. Then provides a fix to rename an error bit to correctly indicate the error. Adds a definition for a new state variable to keep track of features automatically disabled due to hardware resource limitations versus user enforced feature disabled. Anjali provides a patch to add code to handle when there is a filter programming error due to a full table, which also resolves a previous compile warning about an unused "*pf" variable introduced in the last i40e series patch submission. Jesse provides three i40e patches to cleanup strings to make more consistent and to align with other Intel drivers. Akeem cleans up a misleading function header comment for i40e. Mitch provides a fix for i40e/i40evf to use the correctly reported number of MSI-X vectors in the PF an VF. Then provides a patch to use dma_set_mask_and_coherent() which was introduced in v3.13 and simplifies the DMA mapping code a bit. v2: - dropped the 2 ixgbe patches from Emil based on feedback from David Miller, where the 2 fixes should be handled in the net core to fix all drivers ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * i40e/i40evf: Use dma_set_mask_and_coherentMitch Williams2014-03-152-21/+12
| | | | | | | | | | | | | | | | | | | | | | | | In Linux 3.13, dma_set_mask_and_coherent was introduced, and we have been encouraged to use it. It simplifies the DMA mapping code a bit as well. Change-ID: I66e340245af7d0dedfa8b40fec1f5e352754432e Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e/i40evf: Use correct number of VF vectorsMitch Williams2014-03-152-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the 2.4 firmware reports the correct number of MSI-X vectors, use this value correctly when communicating with the VF, and when setting up the interrupt linked list. The PF has always reported the correct number of MSI-X vectors, so we should never increment the value in the vf driver. Change-ID: Ifeefc631c321390192219ce2af9ada6180c1492f Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Let MDD events be handled by MDD handlerAnjali Singhai Jain2014-03-151-2/+1
| | | | | | | | | | | | | | | | | | We have a separate handler for MDD events, a generic reset is not required. Change-ID: I77858e2d479e4e65c52aede67109464649ea0253 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Bug fix for FDIR replay logicAnjali Singhai Jain2014-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | The FDIR replay logic was being run a little too soon (before the queues were enabled) and hence the tail bump was not effective till a later transaction happened on the queue. Change-ID: Icfd7cd2e79fc3cae3cbd3f703a2b3a148b4e7bf6 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Add code to handle FD table full conditionAnjali Singhai Jain2014-03-155-17/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to enforce the following policy: - If the HW reports filter programming error, we check if it's due to a full table. - If so, we go ahead and turn off new rule addition for ATR and then SB in that order. - We monitor the programmed filter count, if enough room is created due to filter deletion/reset, we then re-enable SB and ATR new rule addition. Change-ID: I69d24b29e5c45bc4fa861258e11c2fa7b8868748 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Define a new state variable to keep track of feature auto disableAnjali Singhai Jain2014-03-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | This variable is a bit mask. It is needed to differentiate between user enforced feature disables and auto disable of features due to HW resource limitations. Change-ID: Ib4b4f6ae1bb2668c12e482d2555100bc8ad713d5 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Fix function commentsAkeem G Abodunrin2014-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | Correct misleading function comment. Change-ID: I3f66cff5cc00250a285756b6500a58fad8eba4b5 Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: simplified init stringJesse Brandeburg2014-03-151-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a similar way to how ixgbe works, print a short one-line string showing what features and number of queues the driver and hardware has enabled at probe time. Example (wrapped for the commit message): i40e 0000:06:00.1: Features: PF-id[1] VFs: 64 VSIs: 66 QP: 32 FDir RSS ATR NTUPLE DCB Change-ID: I177bf7f93d1c4c921529c92fdf66e614f6b4f755 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: cleanup stringsJesse Brandeburg2014-03-152-31/+24
| | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up the strings that the driver prints during normal operation and moves many strings into dev_dbg. It also cleans up strings printed during reset. Change-ID: I1835cc4e3c3b22596182b683284e6bb87eac61b2 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: make string references to q be queueJesse Brandeburg2014-03-151-6/+5
| | | | | | | | | | | | | | | | | | | | This cleans up strings for consistency, q is replaced with queue. Change-ID: Ia5f9dfae9af261f4c24485854264e02363729cf3 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e/i40evf: Some flow director HW definition fixesAnjali Singhai Jain2014-03-152-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Fix a name of the error bit to correctly indicate the error. 2) Added a fd_id field in the 32 byte desc at the place(qw0) where it gets reported in the programming error desc WB. In a normal data desc the fd_id field is reported in qw3. Change-ID: Ide9a24bff7273da5889c36635d629bc3b5212010 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Acked-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Kevin Scott <kevin.c.scott@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Fix a bug in the update logic for FDIR SB filter.Anjali Singhai Jain2014-03-151-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | The update filter logic was causing a kernel panic in the original code. We need to compare the input set to decide whether or not to delete a filter since we do not have a hash stored. This new design helps fix the issue. Change-ID: I2462b108e58ca4833312804cda730b4660cc18c9 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: delete netdev after deleting napi and vectorsShannon Nelson2014-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | We've been deleting the netdev before getting around to deleting the napi structs. Unfortunately, we then didn't delete the napi structs because we have a check for netdev, thus we were leaving garbage around in the system. Change-ID: Ife540176f6c9f801147495b3f2d2ac2e61ddcc58 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * igb: Fix code commentJeff Kirsher2014-03-151-1/+1
| | | | | | | | | | | | Recently added code comment was missing a space that is needed. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* | Merge branch 'ieee802154-next'David S. Miller2014-03-1524-482/+841
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phoebe Buckheister says: ==================== ieee802154: fix endianness and header handling This patch set enforces network byte order on all internal operations and fields of the 802.15.4 stack and adds a general representation of 802.15.4 headers with operations to create and parse those headers. This reduces code duplication in the current stack and also allows for upper layers to read headers of packets they have just received; it is also necessary for 802.15.4 link layer security, which requires header mangling. Changes since v1: * fixed lowpan packet rx after reassembly. Control blocks were used to retrieve source/dest addresses, but the CB is clobbered by reassembly. Instead, parse the header anew in lowpan. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: add proper length checks to header creationsPhoebe Buckheister2014-03-153-2/+5
| | | | | | | | | | | | | | | | | | | | | | Have mac802154 header_ops.create fail with -EMSGSIZE if the length passed will be too large to fit a frame. Since 6lowpan will ensure that no packet payload will be too large, pass a length of 0 there. 802.15.4 dgram sockets will also return -EMSGSIZE on payloads larger than the device MTU instead of -EINVAL. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * 6lowpan: move lowpan frag_info out of 802.15.4 headersPhoebe Buckheister2014-03-152-17/+18
| | | | | | | | | | | | | | | | | | | | Fragmentation and reassembly information for 6lowpan is independent from the 802.15.4 stack and used only by the 6lowpan reassembly process. Move the ieee802154_frag_info struct to a private are, it needn't be in the 802.15.4 skb control block. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: use ieee802154_addr instead of *_sa variantsPhoebe Buckheister2014-03-1510-136/+146
| | | | | | | | | | | | | | | | Change all internal uses of ieee802154_addr_sa to ieee802154_addr, except for those instances that communicate directly with userspace. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * mac802154: use header operations to create/parse headersPhoebe Buckheister2014-03-158-304/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the operations on 802.15.4 header structs introduced in a previous patch to create and parse all headers in the mac802154 stack. This patch reduces code duplication between different parts of the mac802154 stack that needed information from headers, and also fixes a few bugs that seem to have gone unnoticed until now: * 802.15.4 dgram sockets would return a slightly incorrect value for the SIOCINQ ioctl * mac802154 would not drop frames with the "security enabled" bit set, even though it does not support security, in violation of the standard Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: add header structs with endiannes and operationsPhoebe Buckheister2014-03-155-5/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides a set of structures to represent 802.15.4 MAC headers, and a set of operations to push/pull/peek these structs from skbs. We cannot simply pointer-cast the skb MAC header pointer to these structs, because 802.15.4 headers are wildly variable - depending on the first three bytes, virtually all other fields of the header may be present or not, and be present with different lengths. The new header creation/parsing routines also support 802.15.4 security headers, which are currently not supported by the mac802154 implementation of the protocol. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: enforce consistent endianness in the 802.15.4 stackPhoebe Buckheister2014-03-1517-95/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable sparse warnings about endianness, replace the remaining fields regarding network operations without explicit endianness annotations with such that are annotated, and propagate this through the entire stack. Uses of ieee802154_addr_sa are not changed yet, this patch is only concerned with all other fields (such as address filters, operation parameters and the likes). Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: add address struct with proper endiannes and some operationsPhoebe Buckheister2014-03-151-0/+72
| | | | | | | | | | | | | | | | | | | | | | Add a replacement ieee802154_addr struct with proper endianness on fields. Short address fields are stored as __le16 as on the network, extended (EUI64) addresses are __le64 as opposed to the u8[8] format used previously. This disconnect with the netdev address, which is stored as big-endian u8[8], is intentional. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: rename struct ieee802154_addr to *_saPhoebe Buckheister2014-03-1513-48/+49
|/ | | | | | | | | | | The struct as currently defined uses host byte order for some fields, and most big endian/EUI display byte order for other fields. Inside the stack, endianness should ideally match network byte order where possible to minimize the number of byteswaps done in critical paths, but this patch does not address this; it is only preparatory. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* 6lowpan: reassembly: un-export local functionsFlorian Westphal2014-03-131-19/+11
| | | | | | | | | most of these are only used locally, make them static. fold lowpan_expire_frag_queue into its caller, its small enough. Cc: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* sh_eth: update OF PHY registerationBen Dooks2014-03-131-20/+39
| | | | | | | | | | | | | | If the sh_eth device is registered using OF, then the driver should call of_mdiobus_register() to register the PHYs described in the devicetree and then use of_phy_connect() to connect the PHYs to the device. This ensures that any PHYs registered in the device tree are appropriately connected to the parent devices nodes so that the PHY drivers can access their OF properties. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* net_sched: return nla_nest_end() instead of skb->lenYang Yingliang2014-03-138-18/+9
| | | | | | | | nla_nest_end() already has return skb->len, so replace return skb->len with return nla_nest_end instead(). Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bcm63xx_enet: Stop pretending to support netpollEric W. Biederman2014-03-131-3/+0
| | | | | | | | | | | bcm_enet_netpoll does not exist, and causing bcm63xx_net to fail to build when NET_POLL_CONTROLLER is defined. Remove the bogus .ndo_poll_controller = bcm_enet_netpoll Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'napi_budget_zero'David S. Miller2014-03-132-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eric W. Biederman says: ==================== Don't receive packets when the napi budget == 0 To the best of understanding processing any received packets when the napi budget == 0 is broken driver behavior. At the same time I don't think we have ever cared before so there are a handful of drivers that need fixes. I care now as I will shortly be using htis in netpoll to get the tx queue processing without the rx queue processing. Drivers that need fixes are few and far between, and so far I have only found two of them. More similar patches later if I find more drivers that need fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * 8139cp: Don't receive packets when the napi budget == 0Eric W. Biederman2014-03-131-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Processing any incoming packets with a with a napi budget of 0 is incorrect driver behavior. This matters as netpoll will shortly call drivers with a budget of 0 to avoid receive packet processing happening in hard irq context. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * bnx2: Don't receive packets when the napi budget == 0Eric W. Biederman2014-03-131-0/+3
|/ | | | | | | | | | | | Processing any incoming packets with a with a napi budget of 0 is incorrect driver behavior. This matters as netpoll will shortly call drivers with a budget of 0 to avoid receive packet processing happening in hard irq context. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* consolidate duplicate code is skb_checksum_setup() helpersJan Beulich2014-03-131-90/+50
| | | | | | | | | | | | | | | | | consolidate duplicate code is skb_checksum_setup() helpers Realizing that the skb_maybe_pull_tail() calls in the IP-protocol specific portions of both helpers are terminal ones (i.e. no further pulls are expected), their maximum size to be pulled can be made match their minimal size needed, thus making the code identical and hence possible to be moved into another helper. Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: Paul Durrant <paul.durrant@citrix.com> Cc: David Miller <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Reviewed-by: Paul Durrant <paul.durrant@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2014-03-1329-51/+132
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to igb, e1000e, ixgbe and ixgbevf. Tom Herbert provides changes to e1000e, igb and ixgbe to call skb_set_hash() to set the hash and its type in an skbuff. Carolyn provides a fix for igb where using ethtool for EEE settings, which was not working correctly. Jacob provides some trivial cleanups and fixes for ixgbe which mainly dealt with the file headers. Julia Lawall provides a one fix for ixgbevf where the driver did not need to adjust the power state on suspend, so the call to pci_set_power_state() in the resume function was a no-op. v2: - dropped patches 4-6 from original series which implemented debugfs for igb from Carolyn based on feed back from David Miller and Or Gerlitz ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * ixgbevf: delete unneeded call to pci_set_power_stateJulia Lawall2014-03-131-1/+0
| | | | | | | | | | | | | | | | | | | | This driver does not need to adjust the power state on suspend, so the call to pci_set_power_state in the resume function is a no-op. Drop it, to make the code more understandable. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: fix some multiline hw_dbg printsJacob Keller2014-03-131-5/+3
| | | | | | | | | | | | | | | | | | | | This patch fixes some formatting on multilined print messages, so that the text of the print appears on a single line, which aids in grepping the sourcecode for where the error came from. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: fixup header for ixgbe_set_rxpba_82598Jacob Keller2014-03-131-7/+7
| | | | | | | | | | | | | | | | The header above this function did not match the function prototype. This patch rewords the comment to specify the correct parameters. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: add Linux NICS mailing list to contact infoJacob Keller2014-03-1323-0/+23
| | | | | | | | | | | | | | | | | | | | This patch updates the contact information on the ixgbe driver files so that every file includes the Linux NICS address, as it is still used, but only a few of the files mentioned it. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: move setting rx_pb_size into get_invariantsJacob Keller2014-03-133-4/+3
| | | | | | | | | | Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: Fix format string in ixgbe_fcoe.cMasanari Iida2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | cppcheck detected following warning in ixgbe_fcoe.c (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Tested-By: Jack Morgan<jack.morgan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * net: ixgbe calls skb_set_hashTom Herbert2014-03-131-1/+3
| | | | | | | | | | | | | | | | | | Drivers should call skb_set_hash to set the hash and its type in an skbuff. Signed-off-by: Tom Herbert <therbert@google.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * igb: Fix for devices using ethtool for EEE settingsCarolyn Wyborny2014-03-134-30/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem where using ethtool for EEE setting was not working correctly. This patch also fixes a problem where the function that checks for EEE status on i354 devices was not being called and was causing warnings with static analysis tools. Reported-by: Rashika Kheria <rashika.kheria@gmail.com> Reported-by: Josh Triplett <josh@joshtriplett.org> Reported-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * net: igb calls skb_set_hashTom Herbert2014-03-131-1/+3
| | | | | | | | | | | | | | | | | | Drivers should call skb_set_hash to set the hash and its type in an skbuff. Signed-off-by: Tom Herbert <therbert@google.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * net: e1000e calls skb_set_hashTom Herbert2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | Drivers should call skb_set_hash to set the hash and its type in an skbuff. Signed-off-by: Tom Herbert <therbert@google.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* | Merge branch 'for-davem' of ↵David S. Miller2014-03-13314-4597/+30338
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next John W. Linville says: ==================== For the mac80211 bits, Johannes says: "This time, I have a number of small fixes and improvements, and those are fairly straight-forward. More interesting changes come from Luca with some preparations for the CSA work, mostly around interface/channel combinations checking. One other possibly interesting change is a small one by myself to add NAPI support back to mac80211, which can help improve TCP behaviour through GRO." For the Bluetooth bits, Gustavo says: "This is our first pull request for 3.15, the main feature here is the addition of the privacy feature for low energy devices. Other than that we have a bunch of small improvements, fixes, and clean ups all over the tree." And... "Another pull request to 3.15. Here we have the second part of the LE private feature, the LE auto-connect feature and improvements to the power off procedures. The rest are small improvements, clean up, and fixes." For the iwlwifi bits, Emmanuel says: "I have here a whole bunch of various things. Trivial cleanups, debugfs handlers and new stuff for the new generation of devices along with new capabilities for monitor mode. We also have support for power save for dual interface mode, but that is not supported by the firmware currently available." And for the Atheros bits, Kalle says: "For ath10k Alexander did some cleanup to PCI error cases and switched ath10k to use pci_enable_msi_range(). Michal implemented AP CSA support and sta_rc_update() operation. I enabled firmware "STA quick kickout" functionality for faster detection of disappeared clients. Also there are lots of small fixes to everywhere from various people." I pulled the wireless tree to avoid some merge conflicts, and I reverted the staging patch that I had mistakenly merged previously. Along with that, mwifiex, brcmfmac, wil6210, ath9k, and a few other drivers get their usual round of updates. Also notable is the addition of yet another driver in the rtlwifi family. ... I have amended this commit request to correct the build problems in staging, including a warning added to one of the staging drivers by the wireless-next tree. I also included a fix from Larry Finger to address an issue found in rtl8723be by Dan Carpenter and smatch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * \ Merge branch 'master' of ↵John W. Linville2014-03-13314-4597/+30338
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/ath/ath9k/recv.c
| | * | rtlwifi: rtl8723be: Fix array dimension problemsLarry Finger2014-03-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a619d1abe20c leads to the following static checker warning: drivers/net/wireless/rtlwifi/rtl8723be/phy.c:667 _rtl8723be_store_tx_power_by_rate() error: buffer overflow 'rtlphy->tx_power_by_rate_offset[band]' 4 <= 5 This warning arises because the code is testing the indices for the wrong maximum values. In addition, the tests merely putput a warning, and then procedes to corrupt memory. With this change, any such invalid memory access is avoided. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | wlan-ng: fixup staging driver for removal of ieee80211_dsss_chan_to_freqJohn W. Linville2014-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3ebe8e257307 ("ieee80211: remove function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}") removed ieee80211_dsss_chan_to_freq, but it neglected to account for this staging driver... Cc: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 16:50:59 +0100