summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * ixgbevf: Indicate removal state explicitlyMark Rustad2014-03-19
| | | | | | | | | | | | | | | | | | | | | | Add a bit, __IXGBEVF_REMOVING, to indicate that the module is being removed. The __IXGBEVF_DOWN bit had been overloaded for this purpose, but that leads to trouble. A few places now check both __IXGBEVF_DOWN and __IXGBEVF_REMOVING. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * ixgbe: add ixgbe_write_pci_cfg_word with ixgbe_removed checkJacob Keller2014-03-19
| | | | | | | | | | | | | | | | | | | | Inline with the current use for ixgbe_read_pci_cfg_word, create a similar function for writing PCI config, which checks whether the adapter has been removed first, if Live Error Recovery has been enabled. 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>
| * igb: Add register defines needed for time sync functionsCarolyn Wyborny2014-03-19
| | | | | | | | | | | | | | | | | | | | | | This patch adds defines needed for implementing the auxiliary time sync functions and also changes code to call the updated defines instead of the old. Reported-by: Richard Cochran <ricahrdcochran@gmail.com> Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * e1000e: Fix Explicitly set Transmit Control RegisterDavid Ertman2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | This patch causes the TCTL to be explicitly set to fix a problem with poor network performance (throughput) on certain silicon when configured for 100M HDX performance. Cc: Todd Fujinaka <todd.fujinaka@intel.com> Signed-off-by: Dave Ertman <davidx.m.ertman@intel.com> Acked-by: Bruce W. Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * e1000e: Fix Hardware Unit HangDavid Ertman2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for pending Tx work when link is lost was mistakenly moved to be done only when link is first detected to be lost. It turns out there is a small window of opportunity for additional Tx work to get queued up shortly after link is dropped. Move the check back to the place it was before in the watchdog task. Put in additional debug information for other reset paths and a final catch-all for false hangs in the scheduled function that prints out the hardware hang message. Signed-off-by: Dave Ertman <davidx.m.ertman@intel.com> Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e/i40evf: Bump build versionsCatherine Sullivan2014-03-19
| | | | | | | | | | | | | | | | | | Bump to version 0.3.36 for i40e and 0.9.16 for i40evf. Change-ID: I7b4ff97b32d2825181803c03c316381a7608a618 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: potential array underflow in i40e_vc_process_vf_msg()Dan Carpenter2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | If "vf_id" is smaller than hw->func_caps.vf_base_id then it leads to an array underflow of the pf->vf[] array. This is unlikely to happen unless the hardware is bad, but it's a small change and it silences a static checker warning. Fixes: 7efa84b7abc1 ('i40e: support VFs on PFs other than 0') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e/i40evf: reduce context descriptorsJesse Brandeburg2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | We don't need context descriptors for every packet, only tso or timesync. This fixes a bug in the driver where it would always add a context even if all the passed in values to the context descriptor function were 0/default values. Change-ID: I0101d2b893380707b5c2de61aab3e16d4310e9a1 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: enable hardware feature head write backJesse Brandeburg2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The hardware supports a feature to avoid updating the descriptor ring by marking each descriptor with a DD bit, and instead writes a memory location with an update to where the driver should clean up to. Enable this feature. Change-ID: I5da4e0681f0b581a6401c950a81808792267fe57 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> 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: Refactor and cleanup i40e_open(), adding i40e_vsi_open()Elizabeth Kappler2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | This patch cleans up and moves a portion of i40e_open to i40e_vsi_open, in order to have a shorter vsi_open function that does only that. Change-ID: I1c418dda94dcfc0eb7d4386a70c330692ef5ecc9 Signed-off-by: Elizabeth Kappler <elizabeth.m.kappler@intel.com> 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: Patch to enable Ethtool/netdev feature flag for NTUPLE controlAnjali Singhai Jain2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | This enables option '-k/-K' in ethtool for NTUPLE control. NTUPLE control requires a reset, to take effect. When the feature is turned off, the SW list of stored FD SB filters gets cleaned up. Change-ID: I9d564b67a10d4afa11de3b320d601c3d2e6edc1f 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>
| * i40evf: use min_tMitch Williams2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Checkpatch complained in an earlier patch about using min(), but that change would have been completely unrelated to the point of that patch. So fix it here. Change-ID: I2cd87b39cfd406850d283b88f259757a6bcd14cd 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>
| * i40evf: correctly program RSS HLUT tableMitch Williams2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HLUT programming loop in in i40evf_configure_rss was a) overly- complicated, and b) just plain broken. Most of the entries ended up being not written at all, so most of the flows ended up at queue zero. Refactor the HLUT programming loop to simply walk through the registers and write four values to each one, incrementing through the number of available queues. Change-ID: I75766179bc67e4e997187794f3144e28c83fd00d 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: support VF link state ndoMitch Williams2014-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This netdev op allows the PF driver to control the virtual link state of the VF devices. This can be used to deny naughty VF drivers access to the wire, or to allow VFs (regardless of temperament) to communicate with each other over the device's internal switch even though external link is down. Add the actual ndo function, and modify vc_notify_link_state to check the link status of each VF before sending a message in the case when physical link changes state. Change-ID: Ib5a6924da78c540789f21d26b5e8086d71c29384 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>
* | micrel: fix masking off LED bitsSergei Shtylyov2014-03-19
|/ | | | | | | | | | | | | Commit 20d8435a1cff (phy: micrel: add of configuration for LED mode) made the obvious mistake when masking off the LED mode bits: forgot to do a logical NOT to the mask with which it ANDs the register value, so that unrelated bits are cleared instead. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Ben Dooks <ben.dooks@codethink.co.uk> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* netfilter: Add missing vmalloc.h include to nft_hash.cDavid S. Miller2014-03-18
| | | | | Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* ieee802154: properly unshare skbs in ieee802154 *_rcv functionsPhoebe Buckheister2014-03-18
| | | | | | | | | | | | ieee802154 sockets do not properly unshare received skbs, which leads to panics (at least) when they are used in conjunction with 6lowpan, so run skb_share_check on received skbs. 6lowpan also contains a use-after-free, which is trivially fixed by replacing the inlined skb_share_check with the explicit call. Signed-off-by: Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> Tested-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge tag 'linux-can-next-for-3.15-20140317' of ↵David S. Miller2014-03-18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/linux-can/linux-can-next linux-can-next-for-3.15-20140317 Marc Kleine-Budde says: ==================== this is a pull request of three patches for net-next/master. It consists of a patch by Oliver Hartkopp, which unifies the MTU settings for CAN interfaces. A patch by Christopher R. Baker populates netdev::dev_id for udev discrimination for multi interface CAN devices. Alexander Shiyan contributes a patch for the mcp251x driver which fixes the regulators operation if CONFIG_REGULATOR is not enabled. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * can: mcp251x: Fix regulators operation without CONFIG_REGULATORAlexander Shiyan2014-03-17
| | | | | | | | | | | | | | | | If CONFIG_REGULATOR is not set, devm_regulator_get() returns NULL, so use IS_ERR_OR_NULL() macro for checks. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * can: populate netdev::dev_id for udev discriminationChristopher R. Baker2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My objective is to be able to totally discriminate CAN ports on multi-port cards via udev so as to rename them to semantically interesting/unique names for my system (e.g., "ecuCAN" and "auxCAN" instead of "can0" and "can1"). The following patch assigns the dev_id field to match the channel number on all multi-channel devices. I can only test my two-port Peak PCI card, but it works as expected: ATTRS{dev_id} now expresses the port number and my udev rules now unambiguously pick out and rename my individual CAN ports. Signed-off-by: Christopher R. Baker <cbaker@rec.ri.cmu.edu> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> [PEAK PCAN-USB pro and EMS PCMCIA] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * can: Unify MTU settings for CAN interfacesOliver Hartkopp2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | CAN interfaces only support MTU values of 16 (CAN 2.0) and 72 (CAN FD). Setting the MTU to other values is pointless but it does not really hurt. With the introduction of the CAN FD support in drivers/net/can a new function to switch the MTU for CAN FD has been introduced. This patch makes use of this can_change_mtu() function to check for correct MTU settings also in legacy CAN (2.0) devices. Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* | via: fix a punctuation typowangweidong2014-03-18
| | | | | | | | | | | | | | | | In generic, after an assignment, we use ';' instead of ','. Although, it won't hurt. Signed-off-by: Wang Weidong <wangweidong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | doc: update driver TX algorithm in timestamping.txtJakub Kicinski2014-03-18
| | | | | | | | | | | | | | | | | | | | | | Since cd4d8fdad1f1 ("net: kernel panic in dev_hard_start_xmit: remove faulty software TX time stamping") dev_hard_start_xmit() will not provide software timestamps. It's a responsibility of the drivers to call skb_tx_timestamp() at the right time. Cc: linux-doc@vger.kernel.org Signed-off-by: Jakub Kicinski <kubakici@wp.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
* | bonding: ratelimit pr_warn()s in 802.3ad modeVeaceslav Falico2014-03-18
| | | | | | | | | | | | | | | | | | | | Only ratelimit the ones that might spam, omiting the ones from enslave/deslave. 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>
* | net: sched: use no more than one page in struct fw_headEric Dumazet2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b4e9b520ca5d ("[NET_SCHED]: Add mask support to fwmark classifier") Patrick added an u32 field in fw_head, making it slightly bigger than one page. Lets use 256 slots to make fw_hash() more straight forward, and move @mask to the beginning of the structure as we often use a small number of skb->mark. @mask and first hash buckets share the same cache line. This brings back the memory usage to less than 4000 bytes, and permits John to add a rcu_head at the end of the structure later without any worry. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Thomas Graf <tgraf@suug.ch> Cc: John Fastabend <john.fastabend@gmail.com> Acked-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'master' of ↵David S. Miller2014-03-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next Steffen Klassert says: ==================== One patch to rename a newly introduced struct. The rest is the rework of the IPsec virtual tunnel interface for ipv6 to support inter address family tunneling and namespace crossing. 1) Rename the newly introduced struct xfrm_filter to avoid a conflict with iproute2. From Nicolas Dichtel. 2) Introduce xfrm_input_afinfo to access the address family dependent tunnel callback functions properly. 3) Add and use a IPsec protocol multiplexer for ipv6. 4) Remove dst_entry caching. vti can lookup multiple different dst entries, dependent of the configured xfrm states. Therefore it does not make to cache a dst_entry. 5) Remove caching of flow informations. vti6 does not use the the tunnel endpoint addresses to do route and xfrm lookups. 6) Update the vti6 to use its own receive hook. 7) Remove the now unused xfrm_tunnel_notifier. This was used from vti and is replaced by the IPsec protocol multiplexer hooks. 8) Support inter address family tunneling for vti6. 9) Check if the tunnel endpoints of the xfrm state and the vti interface are matching and return an error otherwise. 10) Enable namespace crossing for vti devices. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | vti6: Enable namespace changingSteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | vti6 is now fully namespace aware, so allow namespace changing for vti devices. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | vti6: Check the tunnel endpoints of the xfrm state and the vti interfaceSteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | The tunnel endpoints of the xfrm_state we got from the xfrm_lookup must match the tunnel endpoints of the vti interface. This patch ensures this matching. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | vti6: Support inter address family tunneling.Steffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch we can tunnel ipv4 traffic via a vti6 interface. A vti6 interface can now have an ipv4 address and ipv4 traffic can be routed via a vti6 interface. The resulting traffic is xfrm transformed and tunneled through ipv6 if matching IPsec policies and states are present. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | xfrm6: Remove xfrm_tunnel_notifierSteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | This was used from vti and is replaced by the IPsec protocol multiplexer hooks. It is now unused, so remove it. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | vti6: Update the ipv6 side to use its own receive hook.Steffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, vti6 uses the IPsec protocol multiplexer to register its own receive side hooks for ESP, AH and IPCOMP. Vti6 now does the following on receive side: 1. Do an input policy check for the IPsec packet we received. This is required because this packet could be already prosecces by IPsec, so an inbuond policy check is needed. 2. Mark the packet with the i_key. The policy and the state must match this key now. Policy and state belong to the vti namespace and policy enforcement is done at the further layers. 3. Call the generic xfrm layer to do decryption and decapsulation. 4. Wait for a callback from the xfrm layer to properly clean the skb to not leak informations on namespace transitions and update the device statistics. On transmit side: 1. Mark the packet with the o_key. The policy and the state must match this key now. 2. Do a xfrm_lookup on the original packet with the mark applied. 3. Check if we got an IPsec route. 4. Clean the skb to not leak informations on namespace transitions. 5. Attach the dst_enty we got from the xfrm_lookup to the skb. 6. Call dst_output to do the IPsec processing. 7. Do the device statistics. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | vti6: Remove caching of flow informations.Steffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike ip6_tunnel, vti6 does not use the the tunnel endpoint addresses to do route and xfrm lookups. So no need to cache the flow informations. It also does not make sense to calculate the mtu based on such flow informations, so remove this too. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | vti6: Remove dst_entry cachingSteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | Unlike ip6_tunnel, vti6 can lookup multiple different dst entries, dependent of the configured xfrm states. Therefore it does not make sense to cache a dst_entry. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | ipcomp6: Use the IPsec protocol multiplexer APISteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | Switch ipcomp6 to use the new IPsec protocol multiplexer. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | ah6: Use the IPsec protocol multiplexer APISteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | Switch ah6 to use the new IPsec protocol multiplexer. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | esp6: Use the IPsec protocol multiplexer APISteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | Switch esp6 to use the new IPsec protocol multiplexer. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | xfrm6: Add IPsec protocol multiplexerSteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds an IPsec protocol multiplexer for ipv6. With this it is possible to add alternative protocol handlers, as needed for IPsec virtual tunnel interfaces. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | xfrm: Introduce xfrm_input_afinfo to access the the callbacks properlySteffen Klassert2014-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IPv6 can be build as a module, so we need mechanism to access the address family dependent callback functions properly. Therefore we introduce xfrm_input_afinfo, similar to that what we have for the address family dependent part of policies and states. Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
| * | xfrm: rename struct xfrm_filterNicolas Dichtel2014-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | iproute2 already defines a structure with that name, let's use another one to avoid any conflict. CC: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
* | | net/i40e: Avoid double setting of NETIF_F_SG for the HW encapsulation ↵Or Gerlitz2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | feature mask The networking core does it for the driver during registration time. Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookupEric W Biederman2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the i40e and the i40evf driver into the same kernel I get: LD drivers/net/ethernet/intel/built-in.o drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x300): multiple definition of `i40e_ptype_lookup' drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x780): first defined here make[3]: *** [drivers/net/ethernet/intel/built-in.o] Error 1 make[2]: *** [drivers/net/ethernet/intel] Error 2 make[1]: *** [drivers/net/ethernet/] Error 2 make: *** [sub-make] Error 2 Fix this by renaming the i40evf version of this structure from i40e_ptype_lookup to i40evf_ptype_lookup. This build failure was introduced in: commit 206812b5fccb808d1194344eaa942f68f59b2630 Author: Jesse Brandeburg <jesse.brandeburg@intel.com> i40e/i40evf: i40e implementation for skb_set_hash Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Eric W Biederman <ebiederm@xmission.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | e1000e: fix the build error when PM is disabledKevin Hao2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 2800209994f8 (e1000e: Refactor PM flows) changed the SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to protect them with CONFIG_PM_SLEEP. Then cause the following build error when PM is disabled: drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function) .suspend = e1000e_pm_suspend, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function) .resume = e1000e_pm_resume, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function) .thaw = e1000e_pm_thaw, ^ Signed-off-by: Kevin Hao <haokexin@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | igb: remove references to long gone command line parametersFernando Luis Vazquez Cao2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command line parameters QueuePairs, Node, EEE, DMAC and InterruptThrottleRate do not exist these days. Remove all references to them in the Documentation folder and update code comments. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge branch 'altera_tse'David S. Miller2014-03-17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vince Bridgers says: ==================== Altera Triple Speed Ethernet (TSE) Driver This is the version 6 submission for the Altera Triple Speed Ethernet (TSE) driver. All comments received during the version 2, 3, 4, and 5 submissions have been accepted. Please find the change log and a description of the submission below. If you find the submission acceptable, please consider this patch set for inclusion into the Linux kernel. V6: Address comments from V5 review - add call to skb_tx_timestamp in the drivers transmit path - correct use of unsigned int where it was cast to pointer. Use types appropriate for intended and correct use to let the compiler warn us when type usage is incorrect. - use correct semantics for pointer arithmetic in same code path V5: Address comments from V4 review - Add descriptions of statistics to driver documentation. The statstics supported by the driver/controller map to IEEE and RFC statistics, and the names and mappings are described in the user documentation. - Change "unsigned int" to u32 in device structure definitions - Change used of netdev_warn to netif_warn in altera_sgdma.c - Change stat name rx_fifo_drops to ether_drops to match the event actually counted by the hardware. V4: Address comments from V3 review - Change statistics names in ethtool module to follow common use in other ethernet drivers. - remove an unnecessary case in ethtool module - change logging to use netdev_* where possible instead of dev_* - remove logging for OOM errors since those are already logged V3: Address comments from V2 review - Reorder patch submission so that net/ethernet Makefile and Kconfig are committed last, thus not breaking bisect - Use of_get_mac_address instead of of_get_property - Change supplemental and hash configuration bindings to boolean/empty, and more meaningful names - Add check for failure from calls to of_phy_connect and connect_local_phy - Correct code to find mdio child node - Update bindings document - Remove cast to u64 when not necessary - add use of const for statistics strings V2: Address comments from initial RFC review. - The driver files were broken up by major sections of functionality. These include MSGDMA, SGDMA, Misc, and Main. - Add patch for MAINTAINERS file, add the maintainer for this submission - Use 32-bit lower/upper physical address accessor functions so the driver is 64-bit ready. - Use standard bindings where applicable. Especially phy-addr, and change "altr,rx-fifo-depth" to "rx-fifo-depth" and "altr,tx-fifo-depth" to "tx-fifo-depth". - Add use of max-frame-size property - Update bindings documents accordingly - Correct interrupt handler to use budget parameter in the convential way - Use macros consistently to define bit fields across files - Correct include exclusion macro in altera_msgdmahw.h (typo) - Remove use of barriers, these were not necessary since the DMA APIs ensure memory & buffer consistency - Remove use of netif_carrier_off in driver - move probing of phy from the open function to the probe function - use of_get_phy_mode instead of custom function - Use the .data field in the device structure to obtain a pointer to SGDMA or MSGDMA device specific properties and functions. - remove custom function to access devicetree since Altera specific bindings requiring it's use have been deprecated in favor of standard bindings. The Altera TSE is a 10/100/1000 Mbps Ethernet soft IP component that can be configured and synthesized using Quartus, and programmed into Altera FPGAs. Two types of soft DMA IP components are supported by this driver - the Altera SGDMA and the MSGDMA. The MSGDMA DMA component is preferred over the SGDMA, since the SGDMA will be deprecated in favor of the MSGDMA. Software supporting both is provided for customers still using the SGDMA and to demonstrate how multiple types of DMA engines may be supported by the TSE driver in the event customers wish to develop their own custom soft DMA engine for particular applications. The design has been tested on Altera's Cyclone 4, 5, and Cyclone 5 SOC development kits using an ARM A9 processor and an Altera NIOS2 processor. Differences in CPU/DMA coherency management and address alignment are addressed by proper use of driver APIs and semantics. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | net: ethernet: Change Ethernet Makefile and Kconfig for Altera TSE driverVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the Ethernet Makefile and Kconfig files to add the Altera Ethernet driver component. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | MAINTAINERS: Add entry for Altera Triple Speed Ethernet DriverVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a MAINTAINERS entry covering the Altera Triple Speed Ethernet Driver, with support for the MSGDMA and SGDMA soft DMA IP components. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Altera TSE: Add Altera Ethernet Driver Makefile and KconfigVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the Altera Triple Speed Ethernet Makfile and Kconfig file. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Altera TSE: Add main and header file for Altera Ethernet DriverVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the main driver and header file for the Altera Triple Speed Ethernet driver. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Altera TSE: Add Miscellaneous Files for Altera Ethernet DriverVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds miscellaneous files for the Altera Ethernet Driver, including ethtool support. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Altera TSE: Add Altera Ethernet Driver SGDMA file componentsVince Bridgers2014-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the SGDMA soft IP support for the Altera Triple Speed Ethernet driver. Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-21 14:40:45 +0000