aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
...
| * qlcnic: Allow setting TX interrupt coalescing parameters from VF.Sucheta Chakraborty2014-04-27
| | | | | | | | | | | | | | | | o Tx interrupt coalescing parameters can now be set from VF. o Added validation code in PF to validate the parameters. Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Add hwmon interface to export board temperature.Harish Patil2014-04-27
| | | | | | | | | | Signed-off-by: Harish Patil <harish.patil@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * qlcnic: Optimize MAC learning codeShahed Shaikh2014-04-27
|/ | | | | | | | | | | | * Use rx_mac_learn instead of mac_learn and eSwitch flag check in Rx path of 82xx adapter. * Check for MAC filter overrun only after driver scans through cached MAC address list. This will help to update the time stamp of cached MAC addresses even if adapter runs out of MAC address filter limit. * Remove expensive log thrown by driver when MAC address filters are exhausted Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qlcnic: Use pci_enable_msix_exact() instead of pci_enable_msix()Alexander Gordeev2014-04-27
| | | | | | | | | | | | | | | | | | As result of deprecation of MSI-X/MSI enablement functions pci_enable_msix() and pci_enable_msi_block() all drivers using these two interfaces need to be updated to use the new pci_enable_msi_range() or pci_enable_msi_exact() and pci_enable_msix_range() or pci_enable_msix_exact() interfaces. Cc: Shahed Shaikh <shahed.shaikh@qlogic.com> Cc: Dept-HSGLinuxNICDev@qlogic.com Cc: netdev@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Acked-by: Shahed Shaikh <shahed.shaikh@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* FDDI: Reformat <linux/if_fddi.h> for 8-character tabsMaciej W. Rozycki2014-04-27
| | | | | | | | | | | Some of our FDDI support code has been apparently written with an assumption that tabs are 4-character wide. In preparation to the next change this update reformats <linux/if_fddi.h> so that it stays within 79 columns and otherwise renders correctly with 8-character tabs. No functional change. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* tipc: fix a possible memory leakYing Xue2014-04-27
| | | | | | | | | | | | | | | | | | The commit a8b9b96e959f3c035af20b1bd2ba67b0b7269b19 ("tipc: fix race in disc create/delete") leads to the following static checker warning: net/tipc/discover.c:352 tipc_disc_create() warn: possible memory leak of 'req' The risk of memory leak really exists in practice. Especially when it's failed to allocate memory for "req->buf", tipc_disc_create() doesn't free its allocated memory, instead just directly returns with ENOMEM error code. In this situation, memory leak, of course, happens. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qlge: Convert /n to \nJoe Perches2014-04-27
| | | | | | | | Use a newline character appropriately. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'systemport'David S. Miller2014-04-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Florian Fainelli says: ==================== net: Broadcom SYSTEMPORT driver This patchset adds support for the Broadcom SYSTEMPORT Ethernet MAC controller which is used in the latest Broadcom BCM7xxx Set Top Box System-on-a-Chip. This Ethernet MAC is interfaced to an internal switch which will get a separate driver submitted later on. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * MAINTAINERS: add Broadcom SYSTEMPORT driver entryFlorian Fainelli2014-04-26
| | | | | | | | | | | | | | | | Add an entry in the MAINTAINERS file listing myself as the maintainer for the Broadcom SYSTEMPORT Ethernet MAC controller driver. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * net: systemport: hook SYSTEMPORT driver in the buildFlorian Fainelli2014-04-26
| | | | | | | | | | | | | | | | Hook the Broadcom SYSTEMPORT driver into the build system under the SYSTEMPORT Kconfig symbol. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * Documentation: add Broadcom SYSTEMPORT Device Tree bindingsFlorian Fainelli2014-04-26
| | | | | | | | | | | | | | | | Add the Device Tree bindings documentation for the Broadcom SYSTEMPORT Ethernet MAC controller hardware. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driverFlorian Fainelli2014-04-26
|/ | | | | | | | | | | | | | SYSTEMPORT is the latest Ethernet MAC hardware block used on newer BCM7xxx Set Top Box SoCs in conjunction with an internal Ethernet switch. This patch adds support for this hardware block along with the following hardware features: - support for hardware checksum offload (transmit and receive) - support for the 32 transmit queues - MIB counters reading Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of ↵David S. Miller2014-04-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 only. Carolyn provides a number of cleanups to fix checkpatch warnings/errors and two minor issues found by coccicheck. v2: update patch indentation for patch 07 of the series based on feedback from David Miller. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * igb: Change memcpy to struct assignmentCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes issue found by updated coccicheck. 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>
| * igb: Replace 1/0 return values with true/falseCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes issues found by updated coccicheck. 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>
| * igb: Cleanups to remove unneeded extern declarationCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:AVOID_EXTERNS found by checkpatch file check. 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>
| * igb: Cleanups to replace deprecated DEFINE_PCI_DEVICE_TABLECarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | | | This patch changes implementation to remove use of DEFINE_PCI_DEVICE_TABLE. This patch fixes WARNING:DEFINE_PCI_DEVICE_TABLE 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>
| * igb: Cleanups to fix static initializationCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes ERROR:INITIALISED_STATIC from checkpatch file check. 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>
| * igb: Cleanups to fix msleep warningsCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:MSLEEP found by checkpatch check. 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>
| * igb: Cleanups to fix line length warningsCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:LONG_LINE found with checkpatch check. 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>
| * igb: Cleanups to remove return parenthesesCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes ERROR:RETURN_PARENTHESES from checkpatch file check. 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>
| * igb: Cleanups to fix missing break in switch statementsCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:MISSING_BREAK found with checkpatch check. 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>
| * igb: Cleanups to fix assignment in if errorCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes ERROR:ASSIGN_IN_IF found with checkpatch file check. 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>
| * igb: Cleanups to change comment style on license headersCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:NETWORKING_BLOCK_COMMENT_STYLE from checkpatch file check. 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>
| * igb: Cleanups to fix for trailing statementCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes WARNING:TRAILING_STATEMENT from checkpatch file check. 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>
| * igb: Cleanups to fix pointer location errorCarolyn Wyborny2014-04-24
| | | | | | | | | | | | | | | | This patch fixes ERROR:POINTER_LOCATION from checkpatch file check. 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>
* | inetpeer_gc_worker: trivial cleanupxiao jin2014-04-26
| | | | | | | | | | | | | | | | | | | | Do not initialize list twice. list_replace_init() already takes care of initializing list. We don't need to initialize it with LIST_HEAD() beforehand. Signed-off-by: xiao jin <jin.xiao@intel.com> Reviewed-by: David Cohen <david.a.cohen@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | net_namespace: trivial cleanupxiao jin2014-04-26
| | | | | | | | | | | | | | | | | | | | Do not initialize net_kill_list twice. list_replace_init() already takes care of initializing net_kill_list. We don't need to initialize it with LIST_HEAD() beforehand. Signed-off-by: xiao jin <jin.xiao@intel.com> Reviewed-by: David Cohen <david.a.cohen@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge tag 'linux-can-next-for-3.16-20140425' of ↵David S. Miller2014-04-26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/linux-can/linux-can-next Marc Kleine-Budde says: ==================== this is a pull request of 10 patches for net-next/master. It consists of three patches by Alexander Shiyan, which improve the mcp251x driver. Stefano Babic's patch move the SPI driver into a sub folder. The three patches by Olivier Sobrie add support for the Kvaser Leaf v2 and usb mini PCIe hardware to the existing driver. Alexander Stein contributes eg20t support to the c_can pci driver. Together with the patches on the net-tree, we'll be able to remove the pch_can driver soon. Kurt Van Dijck's two patches clean up the sysfs attributes of the softing driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | can: softing: remove unused sysfs attributesKurt Van Dijck2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 'frequency' indicates the embedded cpu's frequency, but that should not be necessary for any purpose. 'txpending' is an attribute for debugging. Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: softing: drop 'channel' sysfs attributeKurt Van Dijck2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | netdev->dev_id obsoletes this property. None of the remaining properties contribute to udev detection methods. The regular calls for the sysfs group can thus safely be restored. Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: c_can: Add support for eg20t (pch_can)Alexander Stein2014-04-24
| | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Acked-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: usb: Kconfig: Improve help for CAN_KVASER_USBOlivier Sobrie2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | Add two new USB devices supported by the driver and fix bad english. Signed-off-by: Olivier Sobrie <olivier@sobrie.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: kvaser_usb: add support for Kvaser Leaf v2 and usb mini PCIeOlivier Sobrie2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Kvaser Leaf v2 and Leaf usb mini PCIe card. Signed-off-by: Olivier Sobrie <olivier@sobrie.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: kvaser_usb: add retries/timeout to kvaser_usb_wait_msg()Olivier Sobrie2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Kvaser hardware, the firmware returns extra messages after the request for card info. For instance on a Leaf Light v2: --> CMD_GET_CARD_INFO <-- CMD_USB_THROTTLE <-- CMD_GET_CARD_INFO2 <-- CMD_GET_CARD_INFO_REQ When it happens, the probing function fails because we only read the first usb message. To overcome this issue, we add a mechanism of retries to the kvaser_usb_wait_msg() function. I tested this patch with the following hardware: - Kvaser Leaf Light - Kvaser Leaf Light v2 - Kvaser USBCan R This patch is necessary for the Leaf Light v2 hardware. Signed-off-by: Olivier Sobrie <olivier@sobrie.be> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: move SPI drivers into a separate directoryStefano Babic2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | Create a directory for all CAN drivers using SPI and move mcp251x driver there. Signed-off-by: Stefano Babic <sbabic@denx.de> Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: mcp251x: Improve mcp251x_hw_probe()Alexander Shiyan2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds check for mcp251x_hw_reset() result on startup and removes unnecessary checking for CANSTAT register since this value is being checked in mcp251x_hw_reset(). Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Tested-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: mcp251x: Improve mcp251x_hw_reset()Alexander Shiyan2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MCP251x utilizes an oscillator startup timer (OST), which holds the chip in reset, to insure that the oscillator has stabilized before the internal state machine begins to operate. The OST maintains reset for the first 128 OSC clock cycles after power up or reset. So, this patch removes unnecessary loops and reduce delay for power on and reset to the safe value. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Tested-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| * | can: mcp251x: Check return value of spi_setup()Alexander Shiyan2014-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves setup of SPI bus a bit earlier and adds check for spi_setup() result to be sure SPI bus is communicating with the device properly. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Tested-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
* | | Merge branch 'at86rf230-next'David S. Miller2014-04-26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alexander Aring says: ==================== at86rf230 cleanup this is the first patch series to cleanup the at86rf230 driver. Later I want to implement regmap and a asynchron spi handling for transmit and receiving frames. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: remove function for setting irq polarityAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is small enough, we don't need a extra function for this. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: remove unnecessary state readAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes a unnecessary state read. The status value is never evaluate after reading the state. Also rename the status variable to dvdd, because this variable will be used later. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: remove unnecessary spi_set_drvdataAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: reset irq line before irq requestAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the irq line before we are requesting the irq. This avoids pending interrupts before requesting. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: remove unnecessary assignAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: remove #ifdef CONFIG_OFAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already handled by the of_match_ptr macro. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: add at86rf230_device_id tableAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a at86rf230_device_id table to offers various module aliases. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Reported-by: Varka Bhadram <varkabhadram@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: make of_device_id constAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: add missing MODULE_DEVICE_TABLEAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Aring <alex.aring@gmail.com> Reported-by: Varka Bhadram <varkabhadram@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | at86rf230: use devm_gpio_request_oneAlexander Aring2014-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replace the gpio_request functions with devm_gpio_request_one functions. Then we don't need to take care about freeing gpios. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>