提交 · 729235554d805c63e5e274fcc6a98e71015dd847 · openeuler / Kernel

17 2月, 2016 37 次提交

tcp: md5: release request socket instead of listener · 72923555

由 Eric Dumazet 提交于 2月 11, 2016

If tcp_v4_inbound_md5_hash() returns an error, we must release
the refcount on the request socket, not on the listener.

The bug was added for IPv4 only.

Fixes: 079096f1 ("tcp/dccp: install syn_recv requests into ehash table")
Signed-off-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

72923555

tcp: do not set rtt_min to 1 · 37202283

由 Eric Dumazet 提交于 2月 11, 2016

There are some cases where rtt_us derives from deltas of jiffies,
instead of using usec timestamps.

Since we want to track minimal rtt, better to assume a delta of 0 jiffie
might be in fact be very close to 1 jiffie.

It is kind of sad jiffies_to_usecs(1) calls a function instead of simply
using a constant.

Fixes: f6722583 ("tcp: track min RTT using windowed min-filter")
Signed-off-by: NEric Dumazet <edumazet@google.com>
Signed-off-by: NNeal Cardwell <ncardwell@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

37202283

pcnet_cs: add new id · 6c5d89a3

由 Ken Kawasaki 提交于 2月 11, 2016

add new id (CONTEC C-NET(PC)C-100TX2)
Signed-off-by: NKen Kawasaki <ken_kawasaki@nifty.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

6c5d89a3

net: dsa: remove phy_disconnect from error path · a407054f

由 Sascha Hauer 提交于 2月 11, 2016

The phy has not been initialized, disconnecting it in the error
path results in a NULL pointer exception. Drop the phy_disconnect
from the error path.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
Acked-by: NNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

a407054f

net: dsa: mv88e6xxx: Add support for Marvell 88E6240 · bd16a724

由 Sascha Hauer 提交于 2月 11, 2016

The Marvell 88E6240 has been tested successfully without further
changes. Add entry to the table of supported devices.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

bd16a724

tipc: fix premature addition of node to lookup table · d5c91fb7

由 Jon Paul Maloy 提交于 2月 10, 2016

In commit 52666986 ("tipc: let broadcast packet reception
use new link receive function") we introduced a new per-node
broadcast reception link instance. This link is created at the
moment the node itself is created. Unfortunately, the allocation
is done after the node instance has already been added to the node
lookup hash table. This creates a potential race condition, where
arriving broadcast packets are able to find and access the node
before it has been fully initialized, and before the above mentioned
link has been created. The result is occasional crashes in the function
tipc_bcast_rcv(), which is trying to access the not-yet existing link.

We fix this by deferring the addition of the node instance until after
it has been fully initialized in the function tipc_node_create().
Acked-by: NYing Xue <ying.xue@windriver.com>
Signed-off-by: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

d5c91fb7

Merge branch 'bnxt_en-fixes' · 7facc5fb

由 David S. Miller 提交于 2月 16, 2016

Michael Chan says:

====================
bnxt_en: Bug fixes.

Fixed autoneg logic and some related cleanups, fixed tx push operation,
and reduced default ring sizes.
====================
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

7facc5fb

bnxt_en: Reduce default ring sizes. · 51dd55b5