03 Apr, 2015
1 commit
-
The goal of this patch is to prepare the removal of the iflink field. It
introduces a new ndo function, which will be implemented by virtual interfaces.There is no functional change into this patch. All readers of iflink field
now call dev_get_iflink().Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller
02 Apr, 2015
26 commits
-
After the TX sgl is expanded we need to explicitly mark end of data
at the last buffer that contains data.Changes in v2
- use type 'bool' and true/false for 'mark'.Signed-off-by: Tadeusz Struk
Signed-off-by: David S. Miller -
Andrew Lunn says:
====================
DSA Mavell drivers refactoring and cleanupv1->v2:
* Add missing signed-of-by: For patches authored by Guenter Roeck.
* Add Reviewed by from Guenter Roack to patch #5.This is a collection of patches again net-next from today containing
refactoring and consolidate of code, cleanups and using #define's to
replace register numbers.Patch #1 Swaps the 6131 driver to use the consolidated setup code.
Patch #2 Moves the Switch IDs used during probe into a central
location. We need these later so that we can differentiate
the different features the devices have.Patch #3 Makes the 6131 driver set the number of ports in the private
state structure. It then uses this, rather than hard coded
maximum number of ports.Patch #4 Similar to Patch #3, but for the 6123_61_65 driver.
Patch #5 Similar to Patch #3, and #4, but for all the remaining
drivers. This greatly increases the similarity of the code
between drivers, allow further patches to consolidate the
duplicated code.Patch #6 Consolidate the switch reset code, which has two minor
variants. Removes around 35 lines per driver.Patch #7 Moves phy page access functions out of the 6352 driver into
the shared code. Currently only the 6352 driver uses this,
but it is likely other devices will come along wanting this
functionality.Patch #8 Consolidates the code used to access phy registers. Removes
around 40 lines of code per driver.Patch #9 Fixes missing mutex locking in the EEE code, and refactors
the code a bit to make it more understandable with respect to
locks.Patch #10 Consolidates reading statistics. This is very similar code
for all devices, but the number of available statistics
differ, which can be determined from the product ID. Removes
around 65 lines per driver.Patch #11 Add #defines for registers, and bits within the
registers. For the moment, this is limited to the shared
code. The individual drivers will be converted once the
remaining duplicated code is consolidatedPatch #12 Fix broken statistic counters on the 6172. The 6352 family
requires the port number is poked into a different set of
bits in the register compared to other devices.Many thanks to Guenter Roeck for repeatedly reviewing the patches and
testing them on his hardware.
====================Signed-off-by: David S. Miller
-
The statistic counters for the mv88e6172 never worked. This device is
a member of the 6352 family of chips, which has a slightly different
layout of the register used for capturing statistics. Add support for
detecting this family and poking the port in the right place in the
register.Signed-off-by: Andrew Lunn
Tested-by: Guenter Roeck
Reviewed-by: Guenter Roeck
Signed-off-by: David S. Miller -
Rather than refer to registers by number, define mnemonics. Also
define mnemonics for the commonly used bits within the registers.Signed-off-by: Andrew Lunn
Reviewed-by: Guenter Roeck
Tested-by: Guenter Roeck
Signed-off-by: David S. Miller -
Reading the statistics from the hardware is the same for all
chips. What differs is the number of available statistics. Have just
one copy of the code in the shared mv88e6xxx.Signed-off-by: Andrew Lunn
Tested-by: Guenter Roeck
Reviewed-by: Guenter Roeck
Signed-off-by: David S. Miller -
The phy_mutex should be held while reading and writing to the phy.
Signed-off-by: Andrew Lunn
Reviewed-by: Guenter Roeck
Tested-by: Guenter Roeck
Signed-off-by: David S. Miller -
Move the common code for reading and writing phy registers into the
shared mv88e6xxx.Signed-off-by: Andrew Lunn
Reviewed-by: Guenter Roeck
Tested-by: Guenter Roeck
Signed-off-by: David S. Miller -
These functions could in future be used by other drivers. Move them
into the shared area.Signed-off-by: Andrew Lunn
Tested-by: Guenter Roeck
Reviewed-by: Guenter Roeck
Signed-off-by: David S. Miller -
Marvell switches are all reset in nearly the same way. The only
difference is if the PPU should be enabled or not. Move this
code into the shared mv88x6xxx.c.Signed-off-by: Andrew Lunn
Reviewed-by: Guenter Roeck
Tested-by: Guenter Roeck
Signed-off-by: David S. Miller -
As a step towards consolidating code, consistently set the
number of ports in the private state structure, and make use of it in
loops.Signed-off-by: Andrew Lunn
Tested-by: Guenter Roeck
Reviewed-by: Guenter Roeck
Signed-off-by: David S. Miller -
Determine and use number of switch ports from chip ID instead of always
using the maximum, and return error when an attempt is made to access a
non-existing port.Signed-off-by: Guenter Roeck
Reviewed-by: Andrew Lunn
Signed-off-by: Andrew Lunn
Signed-off-by: David S. Miller -
Determine and use number of switch ports from chip ID instead of always
using the maximum, and return error when an attempt is made to access a
non-existing port.Signed-off-by: Guenter Roeck
Reviewed-by: Andrew Lunn
Signed-off-by: Andrew Lunn
Signed-off-by: David S. Miller -
This will let us use the switch product IDs in the common source code.
Signed-off-by: Guenter Roeck
Reviewed-by: Andrew Lunn
Signed-off-by: Andrew Lunn
Signed-off-by: David S. Miller -
Common initialization functions will be needed to enable
HW bridging support.Signed-off-by: Guenter Roeck
Reviewed-by: Andrew Lunn
Signed-off-by: Andrew Lunn
Signed-off-by: David S. Miller -
Correct spelling of locally.
Also remove extra space before tab character in struct fq_flow.
Signed-off-by: Simon Horman
Signed-off-by: David S. Miller -
Fix some spelling / typos:
* droppped -> dropped
* asddress -> address
* compatbility -> compatibilitySigned-off-by: Simon Horman
Signed-off-by: David S. Miller -
Signed-off-by: Stephen Hemminger
Signed-off-by: David S. Miller -
Move about half a KB of data to text.
Miscellanea:
o Move strings out of the .h file into the .c file
in case the .h file is ever #included twiceSigned-off-by: Joe Perches
Signed-off-by: David S. Miller -
No need to use kzalloc to allocate sgls as the structure is initialized anyway.
Signed-off-by: Tadeusz Struk
Signed-off-by: David S. Miller -
Use EXPORT_SYMBOL_GPL instead of EXPORT_SYMBOL.
Signed-off-by: Tadeusz Struk
Signed-off-by: David S. Miller -
Move ~2KB of strings in each driver from data to text.
Signed-off-by: Joe Perches
Signed-off-by: David S. Miller -
…ub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
Major changes:ath9k:
* add Active Interference Cancellation, a method implemented in the HW
to counter WLAN RX > sensitivity degradation when BT is transmitting
at the same time. This feature is supported by cards like WB222
based on AR9462.iwlwifi:
* Location Aware Regulatory was added by Arik
* 8000 device family work
* update to the BT Coex firmware APIbrmcfmac:
* add new BCM43455 and BCM43457 SDIO device support
* add new BCM43430 SDIO device supportwil6210:
* take care of AP bridging
* fix NAPI behavior
* found approach to achieve 4*n+2 alignment of Rx framesrt2x00:
* add new rt2800usb device DWA 130
rtlwifi:
* add USB ID for D-Link DWA-131
* add USB ID ASUS N10 WiFi donglemwifiex:
* throughput enhancements
====================Signed-off-by: David S. Miller <davem@davemloft.net>
-
…x/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-04-01this is a pull request of 5 patches for net-next/master.
There are two patches for the ems_usb driver by Gerhard Uttenthaler and
me, which fix sparse endianess warnings. Oliver Hartkopp adds two
patches to improve and extend the CAN-ID filter handling on RAW CAN
sockets. The last patch is by me, it silences an uninitialized variable
warning in the peak_usb driver.
====================Signed-off-by: David S. Miller <davem@davemloft.net>
-
Currently, MoCA fixed PHYs are always in link-up state, regardless of
whether the link is actually up or not.Add code to properly detect MoCA link state changes and to reflect the
new state in MoCA fixed PHY. Only GENET V3 and V4 MACs are capable of
detecting MoCA link state changes.The code works as follows:
1. GENET MAC detects MoCA link state change and issues UMAC_IRQ_LINK_UP
or UMAC_IRQ_LINK_DOWN interrupt.
2. Link up/down interrupt is processed in bcmgenet_irq_task(), which
calls phy_mac_interrupt().
3. phy_mac_interrupt() updates the fixed PHY phydev->link and kicks
the PHY state machine.
4. PHY state machine proceeds to read the fixed PHY link status
register.
5. When the fixed PHY link status register is being read, the new
function bcmgenet_fixed_phy_link_update() gets called. It copies
the fixed PHY phydev->link value to the fixed PHY status->link.
6. PHY state machine receives the new link state of the fixed PHY.
7. MoCA fixed PHY link state now correctly reflects the real MoCA
hardware link state.Signed-off-by: Petri Gynther
Signed-off-by: David S. Miller -
Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.
Moreover use devm_gpiod_get_optional instead of ignoring all errors
returned by devm_gpiod_get and simplify accordingly.The result is more strict error handling which is good.
Signed-off-by: Uwe Kleine-König
Signed-off-by: David S. Miller -
The tty_name member of struct ser_device is never set or used, so it
can be removed. (The definition of struct ser_device is private to
this .c file, and the identifier tty_name only occurs in this one
place.)Signed-off-by: Rasmus Villemoes
Signed-off-by: David S. Miller
01 Apr, 2015
13 commits
-
This patch silences the compiler warning:
drivers/net/can/usb/peak_usb/pcan_usb_fd.c: In function 'pcan_usb_fd_send_cmd':
drivers/net/can/usb/peak_usb/pcan_usb_fd.c:185:6: warning: 'err' may be used uninitialized in this function [-Wuninitialized]by initialising the variable as 0.
Signed-off-by: Marc Kleine-Budde
-
The CAN_RAW socket can set multiple CAN identifier specific filters that lead
to multiple filters in the af_can.c filter processing. These filters are
indenpendent from each other which leads to logical OR'ed filters when applied.This socket option joines the given CAN filters in the way that only CAN frames
are passed to user space that matched *all* given CAN filters. The semantic for
the applied filters is therefore changed to a logical AND.This is useful especially when the filterset is a combination of filters where
the CAN_INV_FILTER flag is set in order to notch single CAN IDs or CAN ID
ranges from the incoming traffic.As the raw_rcv() function is executed from NET_RX softirq the introduced
variables are implemented as per-CPU variables to avoid extensive locking at
CAN frame reception time.Signed-off-by: Oliver Hartkopp
Signed-off-by: Marc Kleine-Budde -
The CAN_RAW socket can set multiple CAN identifier specific filters that lead
to multiple filters in the af_can.c filter processing. These filters are
indenpendent from each other which leads to logical OR'ed filters when applied.This patch makes sure that every CAN frame which is filtered for a specific
socket is only delivered once to the user space. This is independent from the
number of matching CAN filters of this socket.As the raw_rcv() function is executed from NET_RX softirq the introduced
variables are implemented as per-CPU variables to avoid extensive locking at
CAN frame reception time.Signed-off-by: Oliver Hartkopp
Signed-off-by: Marc Kleine-Budde -
The struct ems_cpc_msg describes the a message received from the USB device,
which uses little endian byte order. This patch marks the timestamp in struct
ems_cpc_msg accordingly.Acked-by: Gerhard Uttenthaler
Acked-by: Uwe Kleine-König
Signed-off-by: Marc Kleine-Budde -
The device expects the CAN ID in little endian format.
Signed-off-by: Gerhard Uttenthaler
Signed-off-by: Marc Kleine-Budde -
Richard Cochran says:
====================
ptp: remove open coded ns_to_timespec64 and reverseThis patch series is a follow up to the recent timespec64 work for the
PTP Hardware Clock drivers. Arnd noticed that drivers are using open
coded implementations of ns_to_timespec64 and timespec64_to_ns. This
series replaces the open coded logic with the helper functions.
====================Signed-off-by: David S. Miller
-
This patch changes the driver to use ns_to_timespec64() and
timespec64_to_ns() instead of open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() and
timespec64_to_ns() instead of open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() instead of
open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() and
timespec64_to_ns() instead of open coding the same logic.Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() and
timespec64_to_ns() instead of open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() instead of
open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller -
This patch changes the driver to use ns_to_timespec64() instead of
open coding the same logic.Compile tested only.
Signed-off-by: Richard Cochran
Signed-off-by: David S. Miller
