27 Apr, 2016
38 commits
-
replace the trylock by a full spin_lock and remove TX_LOCKED return value.
Followup patch will remove TX_LOCKED from the kernel.Cc: Jon Mason
Cc: Andy Gospodarek
Signed-off-by: Florian Westphal
Signed-off-by: David S. Miller -
These drivers already call netif_stop_queue() so we should not be called
unless tx space is available. Just free the skb and return TX_OK.Followup patch will remove NETDEV_TX_LOCKED from the kernel.
Cc: linux-parisc@vger.kernel.org
Cc: linux-hams@vger.kernel.org
Cc: Thomas Sailer
Signed-off-by: Florian Westphal
Signed-off-by: David S. Miller -
similar to atl1c: lock is only used in ndo_start_xmit, but we also
advertised LLTX, so remove that as well and let core stack handle
tx locking.Allows to remove the TX_LOCKED return value from the driver.
Cc: Jay Cliburn
Cc: Chris Snook
Signed-off-by: Florian Westphal
Signed-off-by: David S. Miller -
AFAICS this is safe: the lock is only used in the .ndo_start_xmit
function and this driver does not set LLTX.Gets rid of TX_LOCKED return value, followup patches will remove it.
Cc: Jay Cliburn
Cc: Chris Snook
Signed-off-by: Florian Westphal
Signed-off-by: David S. Miller -
ndo_start_xmit never returns it to stack, but nes_nic_send helper used it if
skb could not be queued to hardware. Switch to bool instead.Cc:
Signed-off-by: Florian Westphal
Signed-off-by: David S. Miller -
Sergei Shtylyov says:
====================
Don't return NULL from get_phy_device() anymoreHere's the set of 5 patches against DaveM's 'net-next.git' repo. The first
patch makes get_phy_device() return only error values on error, the rest of
the patches clean up the callers of that function...
====================Signed-off-by: David S. Miller
-
Now that get_phy_device() no longer returns NULL on error, we don't need
to check for it...Signed-off-by: Sergei Shtylyov
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
Now that get_phy_device() no longer returns NULL on error, we don't need
to check for it...Signed-off-by: Sergei Shtylyov
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
Now that get_phy_device() no longer returns NULL on error, we don't need
to check for it...Signed-off-by: Sergei Shtylyov
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
Now that get_phy_device() no longer returns NULL on error, we don't need
to check for it...Signed-off-by: Sergei Shtylyov
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
Arnd Bergmann asked that get_phy_device() returns either NULL or the error
value, not both on error. Do as he said, return ERR_PTR(-ENODEV) instead
of NULL when the PHY ID registers read as all ones.Suggested-by: Arnd Bergmann
Signed-off-by: Sergei Shtylyov
Reviewed-by: Florian Fainelli
Signed-off-by: David S. Miller -
sh_eth_dev_init() is now always called with 'true' as the 2nd argument,
so that there's no more sense in having 2 parameters to this function...Signed-off-by: Sergei Shtylyov
Reviewed-by: Simon Horman
Signed-off-by: David S. Miller -
For sctp assoc, when rcvbuf_policy is set, it will has it's own
rmem_alloc, when we dump asoc info in sctp_diag, we should use that
value on RMEM_ALLOC as well, just like WMEM_ALLOC.Signed-off-by: Xin Long
Signed-off-by: David S. Miller -
macvtap_device_event(NETDEV_UNREGISTER) should check vlan->minor to
determine if it is being invoked in the context of a macvtap_newlink
that failed, for example in this code sequence:macvtap_newlink
macvlan_common_newlink
register_netdevice
call_netdevice_notifiers(NETDEV_REGISTER, dev)
macvtap_device_event(NETDEV_REGISTER)
minor = 0>
rollback_registered(dev);
rollback_registered_many
call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
macvtap_device_event(NETDEV_UNREGISTER)
Signed-off-by: Francesco Ruggeri
Acked-by: "Eric W. Biederman"
Signed-off-by: David S. Miller -
If macvlan_common_newlink fails in register_netdevice after macvlan_init
then it decrements port->count twice, first in macvlan_uninit (from
register_netdevice or rollback_registered) and then again in
macvlan_common_newlink.
A similar problem may exist in the ipvlan driver.
This patch consolidates modifications to port->count into macvlan_init
and macvlan_uninit (thanks to Eric Biederman for suggesting this approach).v3: remove macvtap specific bits.
Signed-off-by: Francesco Ruggeri
Acked-by: "Eric W. Biederman"
Signed-off-by: David S. Miller -
Manish Chopra says:
====================
qed: Bandwidth configuration supportThis series adds support in driver for min/max bandwidth configuration
for the PF on the link change notification or on explicit request of
bandwidth update from the MFW [management firmware].The same infrastructure would later be used by user based flows
[for example, rate shaping for the VFs]Please consider applying this series to "net-next"
====================Signed-off-by: David S. Miller
-
This patch adds support for PF minimum bandwidth update
or configuration notified by management firmware.Signed-off-by: Manish Chopra
Signed-off-by: Yuval Mintz
Signed-off-by: David S. Miller -
This patch adds support for PF maximum bandwidth update
or configuration notified by management firmware.Signed-off-by: Manish Chopra
Signed-off-by: Yuval Mintz
Signed-off-by: David S. Miller -
This patch adds relevant APIs needed to configure WFQ
(Weighted fair queueing) values for the vports. WFQ configuration
is used per vport basis when minimum bandwidth update/configuration
is notified to the PF by the management firmware.Signed-off-by: Manish Chopra
Signed-off-by: Yuval Mintz
Signed-off-by: David S. Miller -
Hariprasad Shenai says:
====================
cxgb4: minor fixes, decode msgs and code refactor for few functionsThis patch series adds new routine to get adapter information and removes
some redundant messages logged in dmesg. Fixes race while freeing tx
descriptors. Decodes module type and link down reason codes obtained from
firmware. Refactor port initialization and FW_PORT_CMD handling. Pass
correct port id in DCB message handler to obtain netdev associated.This patch series has been created against net-next tree and includes
patches on cxgb4 driver.We have included all the maintainers of respective drivers. Kindly review
the change and let us know in case of any review comments.
====================Signed-off-by: David S. Miller
-
Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
The firmware can send a set of asynchronous replies through FW_PORT_CMD
with DCBX information when that's negotiated with the Link Peer. The old
code always assumed that a FW_PORT_CMD reply was always a Get Port
Information message. This change conditionalizes the code to only handle
the Get Port Information messages and throws a warning if we don't
understand what we've been given.Also refactor t4_handle_fw_rpl() so that core functionality performed by
t4_handle_get_port_info() for a specified port.Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
Refactor t4_port_init() so that the core functionality is done by
t4_init_portinfo() for a particular port. Also rename variables to
sensible ones.Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
Decode and log port module error, unknown modules and unsupported
modules.Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
There could be race between t4_eth_xmit() and t4_free_sge_resources() while
freeing tx descriptors, take txq lock in t4_free_sge_resources(). We need
to stop the xmit frame path which runs in bottom half context while
unloading the driver using _bh variant of the lock. This is to prevent
the deadlock between xmit and driver unload.Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
Add new routine to print out general adapter information (various version
numbers, adapter name, part number, serial number, etc.) and remove
redundant information dumped in the Port Information.Signed-off-by: Hariprasad Shenai
Signed-off-by: David S. Miller -
…etooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2016-04-26Here's another set of Bluetooth & 802.15.4 patches for the 4.7 kernel:
- Cleanups & refactoring of ieee802154 & 6lowpan code
- Security related additions to ieee802154 and mrf24j40 driver
- Memory corruption fix to Bluetooth 6lowpan code
- Race condition fix in vhci driver
- Enhancements to the atusb 802.15.4 driverPlease let me know if there are any issues pulling. Thanks.
====================Signed-off-by: David S. Miller <davem@davemloft.net>
-
Nicolas Dichtel says:
====================
netlink: align attributes when needed (patchset #3)This is the continuation (series #3) of the work done to align netlink
attributes when these attributes contain some 64-bit fields.It's the last patchset from what I've seen.
The last user of nla_put_u64() is block/drbd. This module does not use
standard netlink API (see all the stuff in include/linux/genl_magic_struct.h
and include/linux/genl_magic_func.h). I didn't modify it because it's seems
hard to do it whithout testing and fully understanding the context (for
example, why include/linux/drbd_genl.h is not part of uapi?).
Any thoughts?
====================Signed-off-by: David S. Miller
-
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
I also fix commit 8b32ab9e6ef1: use nla_total_size_64bit() for
OVS_FLOW_ATTR_USED in ovs_flow_cmd_msg_size().Fixes: 8b32ab9e6ef1 ("ovs: use nla_put_u64_64bit()")
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
I also fix the value of INET_DIAG_MAX. It's wrong since commit 8f840e47f190
which is only in net-next right now, thus I didn't make a separate patch.Fixes: 8f840e47f190 ("sctp: add the sctp_diag.c file")
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
Signed-off-by: Nicolas Dichtel
Acked-by: Jan Kara
Signed-off-by: David S. Miller -
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller -
Signed-off-by: Nicolas Dichtel
Signed-off-by: David S. Miller
26 Apr, 2016
2 commits
-
Tom Herbert says:
====================
ila: Support for checksum neutral translationsThis patch set updates ILA to support draft-herbert-nvo3-ila-02. The
primary addition is support checksum neutral ILA translation.
This allows address to be performed and still keep any transport
layer checksums that include the addresses in their pseudo header to
still be correct without the translator needing to parse L4.Other items are:
- Structures for ILA addresses, identifiers, locators
- Disallow translation on non-ILA addresses (check by
type in identifier).
- Change xlat (nf_input) to translates solely based
on matching locators not identifiers (since identifiers
are not obfuscated by checksum neutral).
- Side effect if above is that multiple ILA domains are
supported. Each local locator can map to a different
SIR address (ILA domain), and each domain defines its
own identifier space.Tested: Ran TCP_RR with 200 cnxs. ILA performance is slightly better
than previously since we are not longer parsing L4 for checksum
handling. I amd seeing about 1% performance overhead. Also ran
TCP_STREAM and tested non-ILA address (type=0) are not translated.v2: Fix compilation errors
====================Signed-off-by: David S. Miller
-
Support checksum neutral ILA as described in the ILA draft. The low
order 16 bits of the identifier are used to contain the checksum
adjustment value.The csum-mode parameter is added to described checksum processing. There
are three values:
- adjust transport checksum (previous behavior)
- do checksum neutral mapping
- do nothingOn output the csum-mode in the ila_params is checked and acted on. If
mode is checksum neutral mapping then to mapping and set C-bit.On input, C-bit is checked. If it is set checksum-netural mapping is
done (regardless of csum-mode in ila params) and C-bit will be cleared.
If it is not set then action in csum-mode is taken.Signed-off-by: Tom Herbert
Signed-off-by: David S. Miller
