summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* enic: Make dummy rfs functions inline to fix !CONFIG_RFS_ACCEL buildGeert Uytterhoeven2014-06-252-10/+3
| | | | | | | | | | | | | | | | | | If CONFIG_RFS_ACCEL=n: drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_open': drivers/net/ethernet/cisco/enic/enic_main.c:1603:2: error: implicit declaration of function 'enic_rfs_flw_tbl_init' [-Werror=implicit-function-declaration] drivers/net/ethernet/cisco/enic/enic_main.c: In function 'enic_stop': drivers/net/ethernet/cisco/enic/enic_main.c:1630:2: error: implicit declaration of function 'enic_rfs_flw_tbl_free' [-Werror=implicit-function-declaration] Introduced in commit a145df23ef32c7b933875f334ba28791ee75766e ("enic: Add Accelerated RFS support"). Dummy functions are provided, but their prototypes are missing, causing the build failure. Provide dummy static inline functions instead to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* tipc: bump max configurable window sizeErik Hugne2014-06-251-1/+1
| | | | | | | | | | | | The maximum window size is limited by the sequence gap field, which was expanded with bd7845337b105e090dd18912d511139945fa7586 ("tipc: Expand link sequence gap field to 13 bits") We remove the artificial limit that prevents the link window to be set larger than 150. Signed-off-by: Erik Hugne <erik.hugne@ericsson.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2014-06-2511-49/+128
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2014-06-24 This series contains updates to i40e and i40evf. Greg provides a patch to stop the VF device after setting its MAC address. This is due to if the host VMM administrator has changed the VF device's MAC address then the i40e driver needs to halt the VF device so that the administrator will be forced to reload the VF driver so that the VF driver will start using the newly assigned MAC address. Shannon provides several patches for i40e, first makes prep_for_test() a void function since the return value was being ignored for the most part by all its callers. Adds a log warning when the firmware's API minor/major number is not what we expect to assist the user by informing them they may need to update their NVM or SW. Cleans up a stray print message so that it is similar to other print messages. Ensures to set the WoL flag when setting LAA and allow the user to set LAA again. So do not short-circuit the LAA assignment when the driver thinks it has already been done as it is possible that the user might want to force the address setting again. Provides a couple more LAA fixes to ensure the LAA gets restored after resets. Neerav provides a patch for i40e to add a PF reset when a malicious driver event for the PF occurs. As per the specification when the PF driver receives a malicious driver event the queue that caused the event is already stopped and it is expected that the function that owns the queue will reset the queue, but in some cases it may not be possible to determine the queue, so it is suggested to reset the whole function. Carolyn fixes ethtool coalesce settings to allow 0 as a disable value and adds message to user about invalid values. Jesse removes a reserved type which was not removed from the code. Catherine provides a patch to add the ability to enable/disable link from set_link)restart_an() which will make it easy to toggle link without calling set_phy_config() when no other link settings need to change. Anjali provides a patch to ensure we do a PF reset on Tx hang and that way we avoid any Malicious Driver Detect (MDD) events because of a Tx queue disable failure. v2: - fixed the un-needed return in patch 2 based on feedback from Sergei Shtylyov - added punctuation to print statements and code comment based on feedback from Sergei Shtylyov ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * i40e/i40evf: Bump i40e to 0.4.17 and i40evf to 0.9.36Catherine Sullivan2014-06-242-2/+2
| | | | | | | | | | | | | | | | Bump versions. Change-ID: I47fc3433240800cd823ff512f3015822277b0d20 Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Bypass timeout recovery level 0 so as to not cause MDDAnjali Singhai Jain2014-06-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Tx hang happens, usually the Tx queue disable fails. At this point if we try to recover by a VSI reinit the HW gets unhappy and we get a Malicious Driver Detect (MDD) event. HW expects a PF reset if a queue disable fails, if we don't do a PF reset and restart the queue we get an MDD. This patch makes sure we do a PF reset on Tx hang and that way we avoid any MDD because of Tx queue disable failure. Change-ID: I665ab6223577c788da857ee2132e733dc9a451e4 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: no pf reset at pci removeShannon Nelson2014-06-241-6/+0
| | | | | | | | | | | | | | | | | | | | The PF reset to clean up at the end of the remove is a nice thing to do, but it also removes any LAA setting that Wake On LAN wants for future wake up. Change-ID: Ic090ec714df2d722281d11735cf75f2aa4432e2c Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: reapply LAA after resetShannon Nelson2014-06-242-2/+10
| | | | | | | | | | | | | | | | | | The LAA is lost on a reset, so be sure to replay it when rebuilding the switch after any reset. Change-ID: I6e643f9a59dfd899b6cbdf84d93b4bc9c37bb949 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: allow user to set LAA againShannon Nelson2014-06-241-15/+16
| | | | | | | | | | | | | | | | | | | | | | Don't short-circuit the LAA assignment when the driver thinks it has already been done - it is possible that the user might want to force the address setting again. At the same time, this requires a little re-ordering of the filter management. Change-ID: Ia0d71e3bc04edd7b68cf67edecc00abe7b9f6639 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: use WoL flag when setting LAAShannon Nelson2014-06-241-1/+1
| | | | | | | | | | | | | | | | Make sure the Firmware sets up the LAA as a Wake-On-LAN address. Change-ID: I57b9acd8c288424fcfed0911053eb725c400b41c Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Add ablitity to enable/disable link from set_link_restart_anCatherine Sullivan2014-06-243-3/+11
| | | | | | | | | | | | | | | | | | | | The ability is already there in the fw and this will make it easy to toggle link without calling set_phy_config when no other link settings need to change. Change-ID: I185567ae81776382ac145247e4eb1ee95f22382c Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e/i40evf: remove reserved typeJesse Brandeburg2014-06-244-4/+0
| | | | | | | | | | | | | | | | | | One of the PCTYPES that was moved to a reserved value wasn't removed from the code. Change-ID: I31fafe6d79c5f5128179979af5eaafa8c0cd62fe Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Fix ethtool coalesce settingsCarolyn Wyborny2014-06-243-5/+40
| | | | | | | | | | | | | | | | | | | | This patch fixes the i40e_set_coalesce function to allow 0 as a disable value. Also, added message to user about invalid value and provides valid range. Change-ID: I6c9ff11a9861f2045bd543745a3d132999ffbbd8 Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: fix a stray print messageShannon Nelson2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | This log print message will probably never be seen, but it needs to match the "attempting to rebuild switch\n" log message a few lines above. Change-ID: Ic3f5b4f67568d721cb02e826cf2cb33847f51c11 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: warn on newer/older firmware API revShannon Nelson2014-06-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | If the firmware's API minor number is larger than the one expected, log a warning and recommend driver SW update. If the firmware's API major or minor number is smaller then the one expected (n for major, n or n-1 for minor), log a warning and recommend NVM update. Change-ID: If0b887e055478f8e435ba7fa28113b63a6f1bb35 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Add PF reset when Malicious driver event for PFNeerav Parikh2014-06-241-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the spec when the PF driver receives a Malicious driver event the queue that caused the event is already stopped and it is expected that the function that owns the queue will reset the queue. In some cases it may not be possible to determine the queue and it is suggested to reset the whole function. This patch takes the later approach when the event is owned by the PF that owns it. Change-ID: I40f9764a6a5e068c0ef8438db00c5aa9c2c6c1c8 Signed-off-by: Neerav Parikh <neerav.parikh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: make prep_for_reset voidShannon Nelson2014-06-241-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | The return from i40e_prep_for_reset() was being ignored by almost all its callers. The one place it wasn't ignored could have caused a silent and confusing failure of the driver to finish a reset. Since we really are doing a rebuild anyway, ignore this last case as well and simply make the function a void type. Change-ID: Ia4fed7f903d39a6c47c5722625a53e59c3f7ed53 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| * i40e: Stop the VF device after setting its MAC addressGreg Rose2014-06-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If the host VMM administrator has changed the VF device's MAC address then the i40e driver needs to halt the VF device so that the administrator will be forced to reload the VF driver. This will cause the VF driver to start using the newly assigned MAC address. This brings the i40e driver into conformance with operational characteristics of other Intel SR-IOV featured drivers. Change-ID: Ic7242cceb8287dd2cb72fb1f3166a032a28bf88a Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* | mac_pton: Use bool not int returnJoe Perches2014-06-252-6/+6
| | | | | | | | | | | | | | | | | | Use bool instead of int as the return type. All uses are tested with !. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | inet: reduce TLB pressure for listenersEric Dumazet2014-06-251-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | It seems overkill to use vmalloc() for typical listeners with less than 2048 hash buckets. Try kmalloc() and fallback to vmalloc() to reduce TLB pressure. Use kvfree() helper as it is now available. Use ilog2() instead of a loop. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | veth: add netpoll supportWANG Cong2014-06-251-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is trivial to add netpoll support to veth, since it is not a stacked device, we don't need to setup and clean up netpoll. Reported-by: Stefan Priebe <s.priebe@profihost.ag> Cc: "David S. Miller" <davem@davemloft.net> Cc: Neil Horman <nhorman@tuxdriver.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'broadcom_rebranding'David S. Miller2014-06-259-19/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jitendra Kalsaria says: ==================== Rebranding changes for bnx2 and cnic driver The following set of patches are for rebranding Broadcom bnx2 and cnic driver as QLogic drivers. Please apply this series to net-next. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | MAINTAINERS: Update bnx2 maintainersJitendra Kalsaria2014-06-251-1/+2
| | | | | | | | | | | | | | | Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | cnic: Rebranding cnic driver.Jitendra Kalsaria2014-06-255-9/+14
| | | | | | | | | | | | | | | | | | | | | o QLogic has acquired the NetXtremeII products and drivers from Broadcom. This patch re-brands cnic driver as a QLogic driver Signed-off-by: David S. Miller <davem@davemloft.net>
| * | bnx2: Rebranding bnx2 driver.Jitendra Kalsaria2014-06-254-9/+12
|/ / | | | | | | | | | | | | o QLogic has acquired the NetXtremeII products and drivers from Broadcom. This patch re-brands bnx2 driver as a QLogic driver Signed-off-by: David S. Miller <davem@davemloft.net>
* | net/dsa/dsa.c: remove unnecessary null test before kfreeFabian Frederick2014-06-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix checkpatch warning: WARNING: kfree(NULL) is safe this check is probably not required Cc: "David S. Miller" <davem@davemloft.net> Cc: Grant Likely <grant.likely@linaro.org> Cc: netdev@vger.kernel.org Cc: Joe Perches <joe@perches.com> Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'crc32'David S. Miller2014-06-252-85/+88
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Daniel Borkmann says: ==================== crc32 combine improvements So almost a month passed, and I don't want this to get lost somewhere. I have applied the feedback given at that time to this set, rebased plus tested it against latest net-next. I decided to route this via netdev as it improves performance upon library code that provides library bits for SCTP, i.e. for non-linear skb csum handling in IPVS. Thus, resending this for George before it gets lost. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * lib: crc32: Add some additional __pure annotationsGeorge Spelvin2014-06-252-4/+4
| | | | | | | | | | | | | | | | In case they help the compiler. Signed-off-by: George Spelvin <linux@horizon.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * lib: crc32: Mark test data __initconstGeorge Spelvin2014-06-251-2/+2
| | | | | | | | | | | | | | | | So it gets discarded after the selftest. Signed-off-by: George Spelvin <linux@horizon.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * lib: crc32: Greatly shrink CRC combining codeGeorge Spelvin2014-06-252-79/+82
|/ | | | | | | | | | | | | | | | | | There's no need for a full 32x32 matrix, when rows before the last are just shifted copies of the rows after them. There's still room for improvement (especially on X86 processors with CRC32 and PCLMUL instructions), but this is a large step in the right direction [which is in particular useful for its current user, namely SCTP checksumming over multiple skb frags[] entries, i.e. in IPVS balancing when other CRC32 offloads are not available]. The internal primitive is now called crc32_generic_shift and takes one less argument; the XOR with crc2 is done in inline wrappers. Signed-off-by: George Spelvin <linux@horizon.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* cxgb4: Fix endian bug introduced in cxgb4 dcb patchsetAnish Bhatt2014-06-241-4/+4
| | | | | | | | | | | | | | | Hi, This patch fixes warnings generated by sparse as pointed out by kbuild test robot, please apply to net-next. Applies on top of commit 79631c89ed70643fd0579a65834b227795b251ee ("trivial: net/irda/irlmp.c: Fix closing brace followed by if") -Anish v2: cleanup submission as per davem's feedback Fixes: 76bcb31efc06 ("cxgb4 : Add DCBx support codebase and dcbnl_ops") Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* trivial: net/irda/irlmp.c: Fix closing brace followed by ifRasmus Villemoes2014-06-231-1/+2
| | | | | Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
* enic: Kill unused variable in enic_rfs_flw_tbl_init().David S. Miller2014-06-231-1/+1
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'enic'David S. Miller2014-06-2317-104/+786
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Govindarajulu Varadarajan says: ==================== enic updates This series fixes minor bugs and adds new features like Accelerated RFS, busy_poll, tx clean-up in napi_poll. v3: * While doing tx cleanup in napi, ignore budget and clean up all desc possible. v2: * Fix #ifdef coding style issue in '[PATCH 4/8] enic: alloc/free rx_cpu_rmap' And [PATCH 5/8] enic: Add Accelerated RFS support' ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: do tx cleanup in napi pollGovindarajulu Varadarajan2014-06-232-36/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | Till now enic had been doing tx clean in isr. Using napi infrastructure to move the tx clean up out of isr to softirq. Now, wq isr schedules napi poll. In enic_poll_msix_wq we clean up the tx queus. This is applicable only on MSIX. In INTx and MSI we use single napi to clean both rx & tx queues. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: add low latency socket busy_poll supportGovindarajulu Varadarajan2014-06-232-12/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for low latency busy_poll. * Introduce drivers ndo_busy_poll function enic_busy_poll, which is called by socket waiting for data. * Introduce locking between napi_poll nad busy_poll * enic_busy_poll cleans up all the rx pkts possible. While in busy_poll, rq holds the state ENIC_POLL_STATE_POLL. While in napi_poll, rq holds the state ENIC_POLL_STATE_NAPI. * in napi_poll we return if we are in busy_poll. Incase of INTx & msix, we just service wq and return if busy_poll is going on. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: fix lockdep around devcmd_lockTony Camuso2014-06-234-52/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were experiencing occasional "BUG: scheduling while atomic" splats in our testing. Enabling DEBUG_SPINLOCK and DEBUG_LOCKDEP in the kernel exposed a lockdep in the enic driver. enic 0000:0b:00.0 eth2: Link UP ====================================================== [ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ] 3.12.0-rc1.x86_64-dbg+ #2 Tainted: GF W ------------------------------------------------------ NetworkManager/4209 [HC0[0]:SC0[2]:HE1:SE0] is trying to acquire: (&(&enic->devcmd_lock)->rlock){+.+...}, at: [<ffffffffa026b7e4>] enic_dev_packet_filter+0x44/0x90 [enic] The fix was to replace spin_lock with spin_lock_bh for the enic devcmd_lock, so that soft irqs would be disabled while the lock is held. Signed-off-by: Sujith Sankar <ssujith@cisco.com> Signed-off-by: Tony Camuso <tcamuso@redhat.com> Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: Add Accelerated RFS supportGovindarajulu Varadarajan2014-06-236-0/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds supports for Accelerated Receive Flow Steering. When the desired rx is different from current rq, for a flow, kernel calls the driver function enic_rx_flow_steer(). enic_rx_flow_steer adds a IP-TCP/UDP hardware filter. Driver registers a timer function enic_flow_may_expire. This function is called every HZ/4 seconds. In this function we check if the added filter has expired by calling rps_may_expire_flow(). If the flow has expired, it removes the hw filter. As of now adaptor supports only IPv4 - TCP/UDP filters. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: alloc/free rx_cpu_rmapGovindarajulu Varadarajan2014-06-231-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | rx_cpu_rmap provides the reverse irq cpu affinity. This patch allocates and sets drivers netdev->rx_cpu_rmap accordingly. rx_cpu_rmap is set in enic_request_intr() which is called by enic_open and rx_cpu_rmap is freed in enic_free_intr() which is called by enic_stop. This is used by Accelerated RFS. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: devcmd for adding IP 5 tuple hardware filtersGovindarajulu Varadarajan2014-06-236-1/+145
| | | | | | | | | | | | | | | | | | | | | | This patch adds interface to add and delete IP 5 tuple filter. This interface is used by Accelerated RFS code to steer a flow to corresponding receive queue. As of now adaptor supports only ipv4 + tcp/udp packet steering. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * enic: fix return value in _vnic_dev_cmdGovindarajulu Varadarajan2014-06-231-2/+2
| | | | | | | | | | | | | | | | Hardware (in readq(&devcmd->args[0])) returns positive number in case of error. But _vnic_dev_cmd should return a negative value in case of error. Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * flow_keys: Record IP layer protocol in skb_flow_dissect()Govindarajulu Varadarajan2014-06-233-1/+16
|/ | | | | | | | | | | | | | | | | | | skb_flow_dissect() dissects only transport header type in ip_proto. It dose not give any information about IPv4 or IPv6. This patch adds new member, n_proto, to struct flow_keys. Which records the IP layer type. i.e IPv4 or IPv6. This can be used in netdev->ndo_rx_flow_steer driver function to dissect flow. Adding new member to flow_keys increases the struct size by around 4 bytes. This causes BUILD_BUG_ON(sizeof(qcb->data) < sz); to fail in qdisc_cb_private_validate() So increase data size by 4 Signed-off-by: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'cc2520'David S. Miller2014-06-225-0/+1106
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Varka Bhadram says: ==================== Driver for TI CC2520 Radio changes since v6: - proper releasing of resources - changed pr_debug() to dev_dbg() - removed unwanted header file - changed is_tx type to bool changes since v5: - added saddr and panc_changed functionality - rework on lqi field - improvements in checkings for reception - modification in debug messages changes since v4: - feature to write into cc2520 RAM - added h/w address filtering changes since v3: - drop the unused varible changes since v2: - drop spi mode dt binding changes since v1: - improvement in gpio setup - changed len pointer to len variable changes for v1: - improvements in the locking mechanism in Tx and SFD ISR - proper checkings for GPIO pins - avoids the memory leak for priv - used devm_* API's - moved the code from header file to .c file - removed cc2520_unregister() ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * devicetree: add device tree bindings for cc2520 driverVarka Bhadram2014-06-221-0/+29
| | | | | | | | | | | | | | DT bindings for cc2520 radio driver Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: cc2520: add driver to kernel build systemVarka Bhadram2014-06-222-0/+12
| | | | | | | | | | Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
| * ieee802154: cc2520: adds driver for TI CC2520 radioVarka Bhadram2014-06-222-0/+1065
|/ | | | | | | | | | | | | | This patch adds the driver support for the cc2520 radio. Driver support: - Tx and Rx of IEEE-802.15.4 packets - Energy Detection on channel - Setting the Channel for the radio. [b/w 11 - 26 channels] - Start and Stop the radio - h/w address filtering Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'cxgb4-next'David S. Miller2014-06-2215-44/+1492
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anish Bhatt says: ==================== cxgb4 : Add DCBx support to Chelsio cxgb4 driver This patchset adds support for DCBx via dcbnl_ops to the cxgb4 driver. This should enable cxgb4 to work with open-lldp and the like. The last patch only updates copyright year. v2 : move inclusion of struct port_dcb_info to the same patch as where it is defined. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * cxgb4 : Update copyright year on all cxgb4 filesAnish Bhatt2014-06-2211-11/+11
| | | | | | | | | | Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * cxgb4 : Makefile & Kconfig changes for DCBx supportAnish Bhatt2014-06-222-0/+12
| | | | | | | | | | Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * cxgb4 : Integrate DCBx support into cxgb4 module. Register dbcnl_ops to give ↵Anish Bhatt2014-06-223-14/+272
| | | | | | | | | | | | | | access to DCBx functions Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * cxgb4 : Add DCBx support codebase and dcbnl_opsAnish Bhatt2014-06-222-0/+1121
| | | | | | | | | | Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud