* Re: [PATCH net-next 0/9] bnx2x: Start utilizing 7.10.51
From: David Miller @ 2014-08-22 19:31 UTC (permalink / raw)
To: Yuval.Mintz; +Cc: netdev, Ariel.Elior
In-Reply-To: <1408283271-16176-1-git-send-email-Yuval.Mintz@qlogic.com>
From: Yuval Mintz <Yuval.Mintz@qlogic.com>
Date: Sun, 17 Aug 2014 16:47:42 +0300
> This series will enable bnx2x to start utlizing its 7.10.51 FW.
> In addition, it will also add timestamping support, as well as a couple
> of routine semantic cleanups.
>
> Please consider applying this series to `net-next'.
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH] af_decnet: Use time_after_eq
From: David Miller @ 2014-08-22 19:29 UTC (permalink / raw)
To: himangi774; +Cc: linux-decnet-user, netdev, linux-kernel, julia.lawall
In-Reply-To: <20140820175440.GA4556@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Wed, 20 Aug 2014 23:24:40 +0530
> The functions time_before, time_before_eq, time_after, and time_after_eq
> are more robust for comparing jiffies against other values.
>
> A simplified version of the Coccinelle semantic patch making this change
> is as follows:
>
> @change@
> expression E1,E2,E3;
> @@
> - jiffies - E1 >= (E2*E3)
> + time_after_eq(jiffies, E1+E2*E3)
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH] decnet: Use time_after_eq
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: himangi774; +Cc: linux-decnet-user, netdev, linux-kernel, julia.lawall
In-Reply-To: <20140820175009.GA4316@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Wed, 20 Aug 2014 23:20:09 +0530
> The functions time_before, time_before_eq, time_after, and time_after_eq
> are more robust for comparing jiffies against other values.
>
> A simplified version of the Coccinelle semantic patch making this change
> is as follows:
>
> @change@
> expression E1,E2;
> @@
> - (jiffies - E1) >= E2
> + time_after_eq(jiffies, E1+E2)
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH] ipconfig: Use time_before
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: himangi774
Cc: kuznet, jmorris, yoshfuji, kaber, netdev, linux-kernel,
julia.lawall
In-Reply-To: <20140820174410.GA4225@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Wed, 20 Aug 2014 23:14:10 +0530
> The functions time_before, time_before_eq, time_after, and time_after_eq
> are more robust for comparing jiffies against other values.
>
> A simplified version of the Coccinelle semantic patch making this change
> is as follows:
>
> @change@
> expression E1,E2;
> @@
> - jiffies - E1 < E2
> + time_before(jiffies, E1+E2)
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH] dn_dev: Use time_before
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: himangi774; +Cc: linux-decnet-user, netdev, linux-kernel, julia.lawall
In-Reply-To: <20140820174306.GA4180@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Wed, 20 Aug 2014 23:13:07 +0530
> The functions time_before, time_before_eq, time_after, and time_after_eq
> are more robust for comparing jiffies against other values.
>
> A simplified version of the Coccinelle semantic patch making this change
> is as follows:
>
> @change@
> expression E1,E2;
> @@
>
> (
> - (jiffies - E1) < E2
> + time_before(jiffies, E1+E2)
> )
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH] br_multicast: Replace rcu_assign_pointer() with RCU_INIT_POINTER()
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: bernat.ada; +Cc: stephen, netdev, bridge, paulmck, linux-kernel
In-Reply-To: <20140822130609.GA19576@ada>
From: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Date: Fri, 22 Aug 2014 16:06:09 +0300
> The use of "rcu_assign_pointer()" is NULLing out the pointer.
> According to RCU_INIT_POINTER()'s block comment:
> "1. This use of RCU_INIT_POINTER() is NULLing out the pointer"
> it is better to use it instead of rcu_assign_pointer() because it has a
> smaller overhead.
...
> Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net/openvswitch/flow.c: Replace rcu_dereference() with rcu_access_pointer()
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: bernat.ada; +Cc: pshelar, dev, netdev, linux-kernel, paulmck
In-Reply-To: <20140817132943.GA2142@ada>
From: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Date: Sun, 17 Aug 2014 16:29:43 +0300
> The "rcu_dereference()" call is used directly in a condition.
> Since its return value is never dereferenced it is recommended to use
> "rcu_access_pointer()" instead of "rcu_dereference()".
> Therefore, this patch makes the replacement.
...
> Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] net/ipv4/igmp.c: Replace rcu_dereference() with rcu_access_pointer()
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: bernat.ada
Cc: kuznet, jmorris, yoshfuji, kaber, netdev, linux-kernel, paulmck
In-Reply-To: <20140817124941.GA14000@ada>
From: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Date: Sun, 17 Aug 2014 15:49:41 +0300
> The "rcu_dereference()" call is used directly in a condition.
> Since its return value is never dereferenced it is recommended to use
> "rcu_access_pointer()" instead of "rcu_dereference()".
> Therefore, this patch makes the replacement.
...
> Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH v2] bonding: Replace rcu_dereference() with rcu_access_pointer()
From: David Miller @ 2014-08-22 19:28 UTC (permalink / raw)
To: bernat.ada; +Cc: j.vosburgh, vfalico, andy, netdev, linux-kernel, paulmck
In-Reply-To: <20140817102145.GA3854@ada>
From: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Date: Sun, 17 Aug 2014 13:21:45 +0300
> This "rcu_dereference()" call is used directly in a condition.
> Since its return value is never dereferenced it is recommended to use
> "rcu_access_pointer()" instead of "rcu_dereference()".
> Therefore, this patch makes this replacement.
...
> Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH v2] cnic: Replace rcu_dereference() with rcu_access_pointer()
From: David Miller @ 2014-08-22 19:27 UTC (permalink / raw)
To: bernat.ada
Cc: mchan, eddie.wai, joe, mingo, peterz, netdev, linux-kernel,
paulmck
In-Reply-To: <20140817101149.GA3692@ada>
From: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Date: Sun, 17 Aug 2014 13:12:09 +0300
> The "rcu_dereference()" calls are used directly in conditions.
> Since their return values are never dereferenced it is recommended to use
> "rcu_access_pointer()" instead of "rcu_dereference()".
> Therefore, this patch makes the replacements.
...
> Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v2] ipv4: Restore accept_local behaviour in fib_validate_source()
From: David Miller @ 2014-08-22 19:27 UTC (permalink / raw)
To: sebastien.barre
Cc: netdev, gregory.detal, christoph.paasch, hannes, sergei.shtylyov
In-Reply-To: <1408259994-31458-1-git-send-email-sebastien.barre@uclouvain.be>
From: Sébastien Barré <sebastien.barre@uclouvain.be>
Date: Sun, 17 Aug 2014 09:19:54 +0200
> Commit 7a9bc9b81a5b ("ipv4: Elide fib_validate_source() completely when possible.")
> introduced a short-circuit to avoid calling fib_validate_source when not
> needed. That change took rp_filter into account, but not accept_local.
> This resulted in a change of behaviour: with rp_filter and accept_local
> off, incoming packets with a local address in the source field should be
> dropped.
>
> Here is how to reproduce the change pre/post 7a9bc9b81a5b commit:
> -configure the same IPv4 address on hosts A and B.
> -try to send an ARP request from B to A.
> -The ARP request will be dropped before that commit, but accepted and answered
> after that commit.
>
> This adds a check for ACCEPT_LOCAL, to maintain full
> fib validation in case it is 0. We also leave __fib_validate_source() earlier
> when possible, based on the same check as fib_validate_source(), once the
> accept_local stuff is verified.
>
> Cc: Gregory Detal <gregory.detal@uclouvain.be>
> Cc: Christoph Paasch <christoph.paasch@uclouvain.be>
> Cc: Hannes Frederic Sowa <hannes@redhat.com>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Sébastien Barré <sebastien.barre@uclouvain.be>
Applied.
^ permalink raw reply
* Re: [PATCH] isdn/bas_gigaset: use USB API functions rather than constants
From: David Miller @ 2014-08-22 19:27 UTC (permalink / raw)
To: himangi774
Cc: hjlipp, tilman, isdn, gigaset307x-common, netdev, linux-kernel,
julia.lawall
In-Reply-To: <20140817003120.GA11815@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Sun, 17 Aug 2014 06:01:20 +0530
> This patch introduces the use of the function usb_endpoint_num.
>
> The Coccinelle semantic patch that makes these changes is as follows:
>
> @@ struct usb_endpoint_descriptor *epd; @@
>
> - (epd->bEndpointAddress & \(USB_ENDPOINT_NUMBER_MASK\|0x0f\))
> + usb_endpoint_num(epd)
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH] isdn/gigaset: use USB API functions rather than constants
From: David Miller @ 2014-08-22 19:27 UTC (permalink / raw)
To: himangi774
Cc: hjlipp, tilman, isdn, gigaset307x-common, netdev, linux-kernel,
julia.lawall
In-Reply-To: <20140815162412.GA7192@himangi-Dell>
From: Himangi Saraogi <himangi774@gmail.com>
Date: Fri, 15 Aug 2014 21:54:12 +0530
> This patch introduces the use of the function usb_endpoint_num.
>
> The Coccinelle semantic patch that makes these changes is as follows:
>
> @@ struct usb_endpoint_descriptor *epd; @@
>
> - (epd->bEndpointAddress & \(USB_ENDPOINT_NUMBER_MASK\|0x0f\))
> + usb_endpoint_num(epd)
>
> Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
> Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Applied.
^ permalink raw reply
* Re: [PATCH net-next,v3] hyperv: Increase the buffer length for netvsc_channel_cb()
From: David Miller @ 2014-08-22 19:27 UTC (permalink / raw)
To: haiyangz; +Cc: netdev, kys, olaf, jasowang, linux-kernel, driverdev-devel
In-Reply-To: <1408130299-50848-1-git-send-email-haiyangz@microsoft.com>
From: Haiyang Zhang <haiyangz@microsoft.com>
Date: Fri, 15 Aug 2014 19:18:19 +0000
> When the buffer is too small for a packet from VMBus, a bigger buffer will be
> allocated in netvsc_channel_cb() and retry reading the packet from VMBus.
> Increasing this buffer size will reduce the retry overhead.
>
> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
> Reviewed-by: Dexuan Cui <decui@microsoft.com>
Applied, thanks.
^ permalink raw reply
* Re: [patch net-next RFC 03/12] net: introduce generic switch devices support
From: John Fastabend @ 2014-08-22 19:14 UTC (permalink / raw)
To: Jiri Pirko
Cc: Jamal Hadi Salim, Florian Fainelli, netdev, David Miller,
Neil Horman, Andy Gospodarek, tgraf, dborkman, ogerlitz, jesse,
pshelar, azhou, Ben Hutchings, Stephen Hemminger, Jeff Kirsher,
vyasevic, Cong Wang, John Fastabend, Eric Dumazet, Scott Feldman,
Roopa Prabhu, John Linville, dev, jasowang@redhat.com, "Eri
In-Reply-To: <20140822125655.GB1916@nanopsycho.orion>
On 08/22/2014 05:56 AM, Jiri Pirko wrote:
> Fri, Aug 22, 2014 at 02:42:04PM CEST, jhs@mojatatu.com wrote:
>> On 08/21/14 13:05, Florian Fainelli wrote:
>>> 2014-08-21 9:18 GMT-07:00 Jiri Pirko <jiri@resnulli.us>:
>>>> The goal of this is to provide a possibility to suport various switch
>>>> chips. Drivers should implement relevant ndos to do so. Now there is a
>>>> couple of ndos defines:
>>>> - for getting physical switch id is in place.
>>>> - for work with flows.
>>>>
>>>> Note that user can use random port netdevice to access the switch.
>>>
>>> I read through this patch set, and I still think that DSA is the
>>> generic switch infrastructure we already have because it does provide
>>> the following:
>>>
>>> - taking a generic platform data structure (C struct or Device Tree),
>>> validate, parse it and map it to internal kernel structures
>>> - instantiate per-port network devices based on the configuration data provided
>>> - delegate netdev_ops to the switch driver and/or the CPU NIC when relevant
>>> - provide support for hooking RX and TX traffic coming from the CPU NIC
>>>
>>> I would rather we build on the existing DSA infrastructure and add the
>>> flow-related netdev_ops rather than having the two remain in
>>> disconnect while flow-oriented switches driver get progressively
>>> added. I guess I should take a closer look at the rocker driver to see
>>> how hard would that be for you.
>>>
>>> What do you think?
>>
>>
>> I thought we had concluded that DSA was a good path forward? Or maybe at
>> this stage we need to have several alternative approaches
>> and we eventually converge?
>
> That is true. I'm still unsure how to fit this on to DSA or how to change DSA
> the way this fits. This is my quest now. Will report back in a week or so.
>
I would like to use the flow ops in some of our NICs that have
a limited flow table in hardware. It might be easier to use the
NICs as the first implementers of the API even though they are
usually not as capable or large as flow tables in some of the
larger switch asics.
In my opinion it can replace the ioctl flow director APIs although
I don't like how it is tied to OVS in the some of the later RFC patches
but we can work on that.
.John
--
John Fastabend Intel Corporation
^ permalink raw reply
* [PATCH v2] carl9170: Remove redundant protection check
From: Andreea-Cristina Bernat @ 2014-08-22 19:14 UTC (permalink / raw)
To: chunkeey, linville, linux-wireless, netdev, linux-kernel; +Cc: paulmck
The carl9170_op_ampdu_action() function is used only by the mac80211
framework.
Since the mac80211 already takes care of checks and properly serializing
calls to the driver's function there is no need for the driver to do the same
thing.
Signed-off-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
---
Changes in v2:
- Change subject line from
"carl9170: Replace rcu_dereference() with rcu_access_pointer()"
to
"carl9170: Remove redundant protection check"
- Update the commit message according to the modifications
- Delete the lines of interest at the suggestion and explanations of
Christian Lamparter <chunkeey@googlemail.com>
drivers/net/wireless/ath/carl9170/main.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 12018ff..6758b9a 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1430,12 +1430,6 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw,
if (!sta_info->ht_sta)
return -EOPNOTSUPP;
- rcu_read_lock();
- if (rcu_access_pointer(sta_info->agg[tid])) {
- rcu_read_unlock();
- return -EBUSY;
- }
-
tid_info = kzalloc(sizeof(struct carl9170_sta_tid),
GFP_ATOMIC);
if (!tid_info) {
--
1.9.1
^ permalink raw reply related
* Re: [patch net-next RFC 04/12] rtnl: expose physical switch id for particular device
From: John Fastabend @ 2014-08-22 19:08 UTC (permalink / raw)
To: Jiri Pirko
Cc: ryazanov.s.a-Re5JQEeQqe8AvxtiuMwx3w,
jasowang-H+wXaHxf7aLQT0dZR+AlfA,
john.r.fastabend-ral2JQCrhuEAvxtiuMwx3w,
Neil.Jerram-QnUH15yq9NYqDJ6do+/SaQ,
edumazet-hpIqsD4AKlfQT0dZR+AlfA, andy-QlMahl40kYEqcZcGjlUOXw,
dev-yBygre7rU0TnMu66kgdUjQ, nbd-p3rKhJxN3npAfugRpC6u6w,
f.fainelli-Re5JQEeQqe8AvxtiuMwx3w, ronye-VPRAkNaXOzVWk0Htik3J/w,
jeffrey.t.kirsher-ral2JQCrhuEAvxtiuMwx3w,
ogerlitz-VPRAkNaXOzVWk0Htik3J/w, ben-/+tVBieCtBitmTQ+vhA3Yw,
buytenh-OLH4Qvv75CYX/NnBR394Jw,
roopa-qUQiAmfTcIp+XZJcv9eMoEEOCMrvLtNR,
jhs-jkUAjuhPggJWk0Htik3J/w, aviadr-VPRAkNaXOzVWk0Htik3J/w,
nicolas.dichtel-pdR9zngts4EAvxtiuMwx3w,
vyasevic-H+wXaHxf7aLQT0dZR+AlfA, nhorman-2XuSBdqkA4R54TAoqtyWWQ,
netdev-u79uwXL29TY76Z2rM5mHXA,
stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ,
dborkman-H+wXaHxf7aLQT0dZR+AlfA, ebiederm-aS9lmoZGLiVWk0Htik3J/w,
davem-fT/PcQaiUtIeIZ0/mPfg9Q
In-Reply-To: <1408637945-10390-5-git-send-email-jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org>
On 08/21/2014 09:18 AM, Jiri Pirko wrote:
> The netdevice represents a port in a switch, it will expose
> IFLA_PHYS_SWITCH_ID value via rtnl. Two netdevices with the same value
> belong to one physical switch.
>
> Signed-off-by: Jiri Pirko <jiri-rHqAuBHg3fBzbRFIqnYvSA@public.gmane.org>
What is the relation between phys_port_id and phys_switch_id?
phys_port_id was intended to identify a set of ports that belong
to a single uplink port,
eth0 eth1 eth2 eth3 (host facing)
| | | |
| | | |
+---+-------+-------+------+---+
| embedded switch |
+------------------------------+
|
MAC (network)
In the NIC case there is a simply switch with a port to the
network which we currently don't represent with a netdev. Any
netdev where the phys_switch_id's are behind the same embedded
switch.
In the switch id case we are indicating the port is attached to
the same embedded switch as well.
eth0 eth1 eth2 eth3
| | | |
+----+----+----+----+----+
| switch |
+----+----+----+----+----+
but they do not share an uplink port? So in this case each ethx
has a unique phys_port_id but the same phys_switch_id?
In the first case both phys_port_id and phys_switch_id should
be equal for all interfaces correct?
Is that clear/useful at all? We need to document this somewhere
if/when the patches are submitted otherwise I doubt we will get it
consistently right across drivers. There could for example be
somewhat strange devices with virtual functions hanging off of the
switch.
Thanks,
John
--
John Fastabend Intel Corporation
^ permalink raw reply
* [GIT PULL] Networking
From: David Miller @ 2014-08-22 18:47 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
Here are some bug fixes that have piled up during ksummit/linuxcon.
1) Fix endian problems in ibmveth, from Anton Blanchard.
2) IPV6 routing code does GFP_KERNEL allocation in atomic, fix from Benjamin Block.
3) SCTP association fixes from Daniel Borkmann.
4) When multiple VLAN headers are present we have to make sure the second
and subsequent ones are pullable in the SKB otherwise we blindly dereference
garbage. From Jiri Benc.
5) The argument adjustment of the signature of hlist_add_after*()
introduced a regression in the batman-adv code, fix from Sven
Eckelmann.
6) Fix TX hang handling to avoid a panic in i40e, from Anjali Singhai Jain.
7) PTP flag test is inverted in i40e driver, from Jesse Brandeburg.
8) ATM LEC driver needs to hold RTNL mutex over MTU changes, from Chas
Williams.
9) Truncate packets larger then the TPACKET_V3 format configured
buffers, otherwise we overwrite past the end of said buffers. From
Eric Dumazet.
10) Fix endianness bugs in qlcnic firmware handling, from Rajesh
Borundia and Shahed Shaikh.
11) CXGB4 sometimes doesn't get all of the TX completion events it
should resulting in SKBs getting stuck in the TX queue, from
Hariprasad Shenai.
12) When the FEC chip's PTP clock is disabled, you can't access the
register. Add necessary checks to avoid the resulting hang,
from Fugang Duan.
Please pull, thanks a lot!
The following changes since commit c9d26423e56ce1ab4d786f92aebecf859d419293:
Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (2014-08-14 18:13:46 -0600)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net master
for you to fetch changes up to faaa55241f3a6fb5bbe5b075d0595199821eb585:
drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef (2014-08-22 11:31:30 -0700)
----------------------------------------------------------------
Alan Ott (1):
MAINTAINERS: Add section for MRF24J40 IEEE 802.15.4 radio driver
Alexander Stein (1):
can: flexcan: Disable error interrupt when bus error reporting is disabled
Anish Bhatt (1):
cxgb4: Fix race condition in cleanup
Anjali Singhai Jain (2):
i40e: Fix for recent kernel panic
i40e: Fix a few potential VF dereferences
Anton Blanchard (1):
ibmveth: Fix endian issues with rx_no_buffer statistic
Benjamin Block (1):
net: ipv6: fib: don't sleep inside atomic lock
Dan Carpenter (1):
can: c_can: checking IS_ERR() instead of NULL
Daniel Borkmann (2):
net: sctp: spare unnecessary comparison in sctp_trans_elect_best
net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
Dariusz Marcinkiewicz (1):
MAINTAINERS: add entry for ec_bhf driver
David S. Miller (6):
Merge branch 'bcm7xxx'
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net
Merge branch 'cbq-fixes'
tipc: Fix build.
Merge branch 'qlcnic'
Merge tag 'linux-can-fixes-for-3.17-20140821' of git://gitorious.org/linux-can/linux-can
Eric Dumazet (1):
packet: handle too big packets for PACKET_V3
Erik Hugne (1):
tipc: fix message importance range check
Florian Fainelli (3):
net: phy: bcm7xxx: remove 28nm wildcard entry
net: phy: bcm7xxx: re-advertise all supported modes out of suspend
net: phy: bcm7xxx: remove suspend callback for 28nm PHYs
Gwenhael Goavec-Merou (1):
net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function
Hariprasad Shenai (1):
cxgb4: Free completed tx skbs promptly
Iyappan Subramanian (1):
net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
Jesse Brandeburg (1):
i40e: fix PTP bug
Jiri Benc (1):
openvswitch: fix panic with multiple vlan headers
Jitendra Kalsaria (1):
qlcnic: Fix flash access interface to application
Mirza Krak (1):
can: sja1000: Validate initialization state in start method
Nimrod Andy (1):
net: fec: ptp: avoid register access when ipg clock is disabled
Rajesh Borundia (1):
qlcnic: Fix endianess issue in FW dump template header
Rasmus Villemoes (2):
net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
Sebastian Andrzej Siewior (1):
can: flexcan: handle state passive -> warning transition
Shahed Shaikh (1):
qlcnic: Fix endianess issue in firmware load from file operation
Sven Eckelmann (1):
batman-adv: Fix parameter order of hlist_add_behind
Vasily Averin (2):
cbq: incorrectly low bandwidth setting blocks limited traffic
cbq: now_rt removal
Vlad Yasevich (1):
macvlan: Allow setting multicast filter on all macvlan types
Yuval Mintz (1):
bnx2x: Revert UNDI flushing mechanism
chas williams - CONTRACTOR (1):
lec: Use rtnl lock/unlock when updating MTU
zhuyj (1):
sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
MAINTAINERS | 12 ++++++++
drivers/isdn/hardware/eicon/xdi_msg.h | 2 +-
drivers/net/can/c_can/c_can_platform.c | 2 +-
drivers/net/can/flexcan.c | 9 ++++++
drivers/net/can/sja1000/sja1000.c | 62 ++++++++++++++++++++------------------
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 20 ++++++++-----
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 ---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 92 +++++++++++----------------------------------------------
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 32 +++++++++++---------
drivers/net/ethernet/chelsio/cxgb4/sge.c | 3 +-
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 1 +
drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 3 +-
drivers/net/ethernet/freescale/fec.h | 5 +++-
drivers/net/ethernet/freescale/fec_main.c | 18 +++++++++--
drivers/net/ethernet/freescale/fec_ptp.c | 33 ++++++++++++++-------
drivers/net/ethernet/ibm/ibmveth.c | 18 ++++++++---
drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 44 +++++++++++++++++++--------
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 15 +++++++++-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 6 ++--
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 35 +++++++++++++++-------
drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 57 +++++++++++++++++++++++++++++++++++
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 16 +++++++++-
drivers/net/macvlan.c | 10 +++++--
drivers/net/phy/bcm7xxx.c | 42 +++++++++++++-------------
drivers/net/phy/smsc.c | 33 +++++++++++++--------
include/linux/brcmphy.h | 1 -
net/atm/lec.c | 2 ++
net/batman-adv/fragmentation.c | 2 +-
net/ipv6/ip6_fib.c | 2 +-
net/openvswitch/actions.c | 5 ++++
net/packet/af_packet.c | 17 +++++++++++
net/packet/internal.h | 1 +
net/sched/sch_cbq.c | 48 +++++++++---------------------
net/sctp/associola.c | 12 ++++----
net/tipc/port.h | 5 +++-
net/tipc/socket.c | 2 +-
38 files changed, 413 insertions(+), 261 deletions(-)
^ permalink raw reply
* Re: [PATCH] drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
From: David Miller @ 2014-08-22 18:31 UTC (permalink / raw)
To: linux; +Cc: mac, isdn, netdev, linux-kernel
In-Reply-To: <1408725554-2524-1-git-send-email-linux@rasmusvillemoes.dk>
From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Fri, 22 Aug 2014 18:39:14 +0200
> Test for definedness of the macro which is actually defined (the
> change is hard to see: it is s/SSS/SSA/).
>
> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Applied.
^ permalink raw reply
* Re: [PATCH net 0/2] SCTP fix
From: David Miller @ 2014-08-22 18:31 UTC (permalink / raw)
To: dborkman; +Cc: netdev, linux-sctp
In-Reply-To: <1408705410-28558-1-git-send-email-dborkman@redhat.com>
From: Daniel Borkmann <dborkman@redhat.com>
Date: Fri, 22 Aug 2014 13:03:28 +0200
> Daniel Borkmann (2):
> net: sctp: spare unnecessary comparison in sctp_trans_elect_best
> net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
Both applied, thanks.
^ permalink raw reply
* Re: [PATCH] netdev_adjacent_sysfs_*: fix cross-namespace symlinks
From: David Miller @ 2014-08-22 18:30 UTC (permalink / raw)
To: git.user; +Cc: netdev, vfalico
In-Reply-To: <1408703693-6265-1-git-send-email-git.user@gmail.com>
From: "Alexander Y. Fomichev" <git.user@gmail.com>
Date: Fri, 22 Aug 2014 14:34:53 +0400
> fix code manipulating symlinks of adjacent net devices.
> - prevent creation of sysfs symlink to / from adjacent device on
> another net_ns.
> - Drop all existing symlinks from / to all adj_dev(s) on the current
> namespace before switching net_ns and recreate them just after.
Please resubmit this with a proper Signed-off-by tag.
^ permalink raw reply
* Re: [PATCH] net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
From: David Miller @ 2014-08-22 18:30 UTC (permalink / raw)
To: linux; +Cc: ariel.elior, netdev, linux-kernel
In-Reply-To: <87mwaxrnbg.fsf@rasmusvillemoes.dk>
From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Fri, 22 Aug 2014 09:33:07 +0200
> David Miller <davem@davemloft.net> writes:
>
>> From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
>> Date: Wed, 20 Aug 2014 15:14:49 +0200
>>
>>> Nothing defines _ASM_GENERIC_INT_L64_H, it is a weird way to check for
>>> 64 bit longs, and u64 should be printed using %llx anyway.
>>>
>>> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
>>
>> It's not correct and will warn on some platforms where "u64" is just
>> a plain "unsigned long".
>>
>> Ie. all of those which use include/asm-generic/int-l64.h
>
> Of which there are none; that file no longer exists (as I said, nothing
> defines that macro). Please see 0c79a8e2 ("asm/types.h: Remove
> include/asm-generic/int-l64.h") and 2a7930bd
> ("Documentation/printk-formats.txt: No casts needed for u64/s64").
Ok that makes sense, applied, thank you.
^ permalink raw reply
* Re: TCP output handling bug ?
From: Eric Dumazet @ 2014-08-22 18:30 UTC (permalink / raw)
To: David Miller; +Cc: davej, stephen, alan, netdev, ycheng
In-Reply-To: <20140822.104118.710757967194596933.davem@davemloft.net>
On Fri, 2014-08-22 at 10:41 -0700, David Miller wrote:
> What about ECE/CWR?
TCP fastopen begins its life with a fresh socket.
We received no packet from the peer yet for this flow that we are
building.
^ permalink raw reply
* Re: [PATCH] ibmveth: Fix endian issues with rx_no_buffer statistic
From: David Miller @ 2014-08-22 18:28 UTC (permalink / raw)
To: anton; +Cc: santil, paulus, linuxppc-dev, netdev
In-Reply-To: <20140822113652.7e4bdc78@kryten>
From: Anton Blanchard <anton@samba.org>
Date: Fri, 22 Aug 2014 11:36:52 +1000
> Hidden away in the last 8 bytes of the buffer_list page is a solitary
> statistic. It needs to be byte swapped or else ethtool -S will
> produce numbers that terrify the user.
>
> Since we do this in multiple places, create a helper function with a
> comment explaining what is going on.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
Applied, thanks Anton.
^ permalink raw reply
* Re: [PATCH] net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
From: David Miller @ 2014-08-22 18:25 UTC (permalink / raw)
To: isubramanian; +Cc: netdev, dan.carpenter
In-Reply-To: <1408653888-10193-1-git-send-email-isubramanian@apm.com>
From: Iyappan Subramanian <isubramanian@apm.com>
Date: Thu, 21 Aug 2014 13:44:48 -0700
> A NULL pointer dereference is possible for the argument ring->buf_pool
> which is passed to xgene_enet_free_desc_ring(), as ring could be NULL.
>
> And now since NULL pointers are being checked for before the calls to
> xgene_enet_free_desc_ring(), might as well take advantage of them and
> not call the function if the argument would be NULL.
>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Applied, thanks.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox