* [PATCH net-next 1/5] bna: fix declaration mismatch
From: Stephen Hemminger @ 2013-03-08 19:07 UTC (permalink / raw)
To: David Miller, Rasesh Mody; +Cc: netdev, Stephen Hemminger
In-Reply-To: <20130308190739.260966567@vyatta.com>
[-- Attachment #1: bna-mismatch.patch --]
[-- Type: text/plain, Size: 815 bytes --]
The function is declared to take u32 but definition uses enum.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
--- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c 2013-03-08 10:33:19.142142147 -0800
+++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c 2013-03-08 10:33:21.534142211 -0800
@@ -76,7 +76,7 @@ static void bfa_ioc_pf_disabled(struct b
static void bfa_ioc_pf_failed(struct bfa_ioc *ioc);
static void bfa_ioc_pf_hwfailed(struct bfa_ioc *ioc);
static void bfa_ioc_pf_fwmismatch(struct bfa_ioc *ioc);
-static void bfa_ioc_boot(struct bfa_ioc *ioc, u32 boot_type,
+static void bfa_ioc_boot(struct bfa_ioc *ioc, enum bfi_fwboot_type boot_type,
u32 boot_param);
static u32 bfa_ioc_smem_pgnum(struct bfa_ioc *ioc, u32 fmaddr);
static void bfa_ioc_get_adapter_serial_num(struct bfa_ioc *ioc,
^ permalink raw reply
* [PATCH net-next 4/5] team: make local function static
From: Stephen Hemminger @ 2013-03-08 19:07 UTC (permalink / raw)
To: David Miller, Jiri Pirko; +Cc: netdev, Stephen Hemminger
In-Reply-To: <20130308190739.260966567@vyatta.com>
[-- Attachment #1: team-static.patch --]
[-- Type: text/plain, Size: 576 bytes --]
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
--- a/drivers/net/team/team.c 2013-03-06 15:30:50.195924953 -0800
+++ b/drivers/net/team/team.c 2013-03-08 10:34:45.446144458 -0800
@@ -503,9 +503,9 @@ static bool team_dummy_transmit(struct t
return false;
}
-rx_handler_result_t team_dummy_receive(struct team *team,
- struct team_port *port,
- struct sk_buff *skb)
+static rx_handler_result_t team_dummy_receive(struct team *team,
+ struct team_port *port,
+ struct sk_buff *skb)
{
return RX_HANDLER_ANOTHER;
}
^ permalink raw reply
* [PATCH net-next 0/5] Trivial patches
From: Stephen Hemminger @ 2013-03-08 19:07 UTC (permalink / raw)
To: David Miller; +Cc: netdev
These are trivial patches to fix some sparse warnings.
^ permalink raw reply
* [PATCH] rrunner.c: fix possible memory leak in rr_init_one()
From: daveo @ 2013-03-08 18:28 UTC (permalink / raw)
To: netdev; +Cc: jes, David Oostdyk
From: David Oostdyk <daveo@ll.mit.edu>
In the event that register_netdev() failed, the rrpriv->evt_ring
allocation would have not been freed.
Signed-off-by: David Oostdyk <daveo@ll.mit.edu>
---
drivers/net/hippi/rrunner.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index d471963..970595a 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -203,6 +203,9 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
return 0;
out:
+ if (rrpriv->evt_ring)
+ pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
+ rrpriv->evt_ring_dma);
if (rrpriv->rx_ring)
pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
rrpriv->rx_ring_dma);
--
1.8.1.5
^ permalink raw reply related
* Re: [PATCH net] tg3: Update link_up flag for phylib devices
From: David Miller @ 2013-03-08 18:15 UTC (permalink / raw)
To: nsujir; +Cc: netdev, hirofumi, stable, mchan
In-Reply-To: <1362765684-5265-1-git-send-email-nsujir@broadcom.com>
From: "Nithin Nayak Sujir" <nsujir@broadcom.com>
Date: Fri, 8 Mar 2013 10:01:24 -0800
> Commit f4a46d1f46a8fece34edd2023e054072b02e110d introduced a bug where
> the ifconfig stats would remain 0 for phylib devices. This is due to
> tp->link_up flag never becoming true causing tg3_periodic_fetch_stats()
> to return.
>
> The link_up flag was being updated in tg3_test_and_report_link_chg()
> after setting up the phy. This function however, is not called for
> phylib devices since the driver does not do the phy setup.
>
> This patch moves the link_up flag update into the common
> tg3_link_report() function that gets called for phylib devices as well
> for non phylib devices when the link state changes.
>
> To avoid updating link_up twice, we replace tg3_carrier_...() calls that
> are followed by tg3_link_report(), with netif_carrier_...(). We can then
> remove the unused tg3_carrier_on() function.
>
> CC: <stable@vger.kernel.org>
> Reported-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
> Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied, thanks.
^ permalink raw reply
* [PATCH net] tg3: Update link_up flag for phylib devices
From: Nithin Nayak Sujir @ 2013-03-08 18:01 UTC (permalink / raw)
To: davem; +Cc: netdev, hirofumi, stable, Nithin Nayak Sujir, Michael Chan
Commit f4a46d1f46a8fece34edd2023e054072b02e110d introduced a bug where
the ifconfig stats would remain 0 for phylib devices. This is due to
tp->link_up flag never becoming true causing tg3_periodic_fetch_stats()
to return.
The link_up flag was being updated in tg3_test_and_report_link_chg()
after setting up the phy. This function however, is not called for
phylib devices since the driver does not do the phy setup.
This patch moves the link_up flag update into the common
tg3_link_report() function that gets called for phylib devices as well
for non phylib devices when the link state changes.
To avoid updating link_up twice, we replace tg3_carrier_...() calls that
are followed by tg3_link_report(), with netif_carrier_...(). We can then
remove the unused tg3_carrier_on() function.
CC: <stable@vger.kernel.org>
Reported-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
---
drivers/net/ethernet/broadcom/tg3.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index fdb9b56..93729f9 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -1869,6 +1869,8 @@ static void tg3_link_report(struct tg3 *tp)
tg3_ump_link_report(tp);
}
+
+ tp->link_up = netif_carrier_ok(tp->dev);
}
static u16 tg3_advert_flowctrl_1000X(u8 flow_ctrl)
@@ -2522,12 +2524,6 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
return err;
}
-static void tg3_carrier_on(struct tg3 *tp)
-{
- netif_carrier_on(tp->dev);
- tp->link_up = true;
-}
-
static void tg3_carrier_off(struct tg3 *tp)
{
netif_carrier_off(tp->dev);
@@ -2553,7 +2549,7 @@ static int tg3_phy_reset(struct tg3 *tp)
return -EBUSY;
if (netif_running(tp->dev) && tp->link_up) {
- tg3_carrier_off(tp);
+ netif_carrier_off(tp->dev);
tg3_link_report(tp);
}
@@ -4262,9 +4258,9 @@ static bool tg3_test_and_report_link_chg(struct tg3 *tp, int curr_link_up)
{
if (curr_link_up != tp->link_up) {
if (curr_link_up) {
- tg3_carrier_on(tp);
+ netif_carrier_on(tp->dev);
} else {
- tg3_carrier_off(tp);
+ netif_carrier_off(tp->dev);
if (tp->phy_flags & TG3_PHYFLG_MII_SERDES)
tp->phy_flags &= ~TG3_PHYFLG_PARALLEL_DETECT;
}
--
1.8.1.4
^ permalink raw reply related
* Re: [PATCH] net: proc: revert proc_net_fops_create/proc_net_remove removal
From: David Miller @ 2013-03-08 17:46 UTC (permalink / raw)
To: adobriyan; +Cc: netdev, gaofeng
In-Reply-To: <20130308135635.GA1078@p183.telecom.by>
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 8 Mar 2013 16:56:35 +0300
> Revert the following patches:
I'm not going back and forth again on this, you guys need to fight it
out.
I personally thought the removal was fine, and the extra interfaces
were just clutter. Justifying it just to hide init_net.proc_net is
a scarecrow at best.
^ permalink raw reply
* Re: [PATCH net-next] cxgb4: Allow for backward compatibility with new VPD scheme.
From: David Miller @ 2013-03-08 17:44 UTC (permalink / raw)
To: vipul; +Cc: netdev, divy, dm, abhishek, santosh
In-Reply-To: <1362749729-4532-1-git-send-email-vipul@chelsio.com>
From: Vipul Pandya <vipul@chelsio.com>
Date: Fri, 8 Mar 2013 19:05:29 +0530
> From: Santosh Rastapur <santosh@chelsio.com>
>
> New scheme calls for 3rd party VPD at offset 0x0 and Chelsio VPD at offset
> 0x400 of the function. If no 3rd party VPD is present, then a copy of
> Chelsio's VPD will be at offset 0x0 to keep in line with PCI spec which
> requires the VPD to be present at offset 0x0.
>
> Signed-off-by: Santosh Rastapur <santosh@chelsio.com>
> Signed-off-by: Vipul Pandya <vipul@chelsio.com>
Isn't this a fix which is better targetted at 'net' than 'net-next'?
^ permalink raw reply
* Re: [PATCH] rrunner.c: fix possible memory leak in rr_init_one()
From: David Miller @ 2013-03-08 17:32 UTC (permalink / raw)
To: daveo; +Cc: netdev, jes
In-Reply-To: <513A1E8A.7040408@ll.mit.edu>
From: David Oostdyk <daveo@ll.mit.edu>
Date: Fri, 8 Mar 2013 12:23:22 -0500
> out:
> + if (rrpriv->evt_ring)
> + pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
> + rrpriv->evt_ring_dma);
Please resend this without the patch being corrupted by your
email client.
Read Documentation/email-clients.txt, and use it to correct this.
Send a test patch to yourself, and only after you can successfully
apply such a patch sent to your yourself should you resubmit your
patch here.
Thanks.
^ permalink raw reply
* Re: [PATCH] ipv6 addrconf: Fix addrconf_ifid_eui64 of 802.15.4 devices
From: YOSHIFUJI Hideaki @ 2013-03-08 17:30 UTC (permalink / raw)
To: Alexander Aring
Cc: davem, kuznet, jmorris, linux-zigbee-devel, netdev,
YOSHIFUJI Hideaki
In-Reply-To: <20130308093739.GB788@x61s.8.8.8.8>
Alexander Aring wrote:
> Hi,
>
> On Fri, Mar 08, 2013 at 11:21:38AM +0900, YOSHIFUJI Hideaki wrote:
>> Hi,
>>
>> Alexander Aring wrote:
>>> Hi,
>>>
>>> I don't know if this is a right solution for that, because other
>>> functions like addrconf_ifid_infiniband to manipulate eui after memcpy,
>>> too.
>>>
>>> But this patch solves my problems with ieee802154 stack.
>>
>> What kind of problems do you have?
>>
>
> I compile with #define DEBUG enabled in net/ieee802154/6lowpan.c
>
> The problem is the address compression in 6lowpan.
>
> First device has address fe80::a000:0:0:1/64. Second device has address
> fe80::a000:0:0:2/64. I use only a ping6 to check connection.
>
> Debug Information on the receiving side:
> Without your patch which is working.
>
> iphc0 = 7a, iphc1 = 11
> NH flag is set, next header carried inline: 3a
> source address stateless compression
> (lowpan_uncompress_addr) linklocal address:
> a0 00 00 00 00 00 00 02
> uncompressing 2 + 8 =>
> fe 80 00 00 00 00 00 00 a0 00 00 00 00 00 00 02
> dest: stateless compression
> (lowpan_uncompress_addr) linklocal address:
> a0 00 00 00 00 00 00 01
> uncompressing 2 + 8 =>
> fe 80 00 00 00 00 00 00 a0 00 00 00 00 00 00 01
> skb headroom size = 40, data length = 64
> IPv6 header dump:
> version = 6
> length = 64
> nexthdr = 0x3a
> hop_lim = 64
>
>
> With your patch, which isn't working anymore:
>
> iphc0 = 7b, iphc1 = 3b
> NH flag is set, next header carried inline: 3a
> source address stateless compression
> (lowpan_uncompress_addr) linklocal address:
> 02 85 00 3a 20 00 00 00
> uncompressing 2 + 0 =>
> fe 80 00 00 00 00 00 00 00 85 00 3a 20 00 00 00
> dest: non context-based mcast compression
> uncompressing 2 + 1 =>
> ff 02 00 00 00 00 00 00 00 00 00 00 00 00 00 02
> skb headroom size = 25, data length = 24
> IPv6 header dump:
> version = 6
> length = 24
> nexthdr = 0x3a
> hop_lim = 255
>
> And for every ipv6 packet I got:
> ICMPv6 checksum failed [fe80:0000:0000:0000:0001:ff00:0001:8700 > ff02:0000:0000:0000:0000:0001:ff00:0001]
>
> I seems that the reconstructed destination address and header length are
> not right.
That's wired. It is expected to work whatever valid source/destination
addresses are used, right?
--yoshfuji
^ permalink raw reply
* Re: [PATCH net-next] ipv6: ndisc: remove redundant check for !dev->addr_len
From: David Miller @ 2013-03-08 17:30 UTC (permalink / raw)
To: yoshfuji; +Cc: tgraf, netdev
In-Reply-To: <513A1279.3040105@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sat, 09 Mar 2013 01:31:53 +0900
> Thomas Graf wrote:
>> send_sllao is already initialized with the value of dev->addr_len
>>
>> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
>> Signed-off-by: Thomas Graf <tgraf@suug.ch>
...
>>
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v4 4/4] ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set
From: David Miller @ 2013-03-08 17:30 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <513A1232.7040707@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sat, 09 Mar 2013 01:30:42 +0900
> Hannes Frederic Sowa wrote:
>> v4:
>> a) unchanged
>>
>> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
...
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v4 2/4] ipv6: use newly introduced __ipv6_addr_needs_scope_id and ipv6_iface_scope_id
From: David Miller @ 2013-03-08 17:29 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <513A11E4.6040905@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sat, 09 Mar 2013 01:29:24 +0900
> Hannes Frederic Sowa wrote:
>> This patch requires multicast interface-scoped addresses to supply a
>> sin6_scope_id. Because the sin6_scope_id is now also correctly used
>> in case of interface-scoped multicast traffic this enables one to use
>> interface scoped addresses over interfaces which are not targeted by the
>> default multicast route (the route has to be put there manually, though).
>>
>> getsockname() and getpeername() now return the correct sin6_scope_id in
>> case of interface-local mc addresses.
>>
>> v2:
>> a) rebased ontop of patch 1/4 (now uses ipv6_addr_props)
>>
>> v3:
>> a) reverted changes for ipv6_addr_props
>>
>> v4:
>> a) unchanged
>>
>> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
...
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>dave
Applied.
^ permalink raw reply
* Re: [PATCH net-next v4 1/4] ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
From: David Miller @ 2013-03-08 17:29 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <513A11C8.7050308@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sat, 09 Mar 2013 01:28:56 +0900
> Hannes Frederic Sowa wrote:
>> __ipv6_addr_needs_scope_id checks if an ipv6 address needs to supply
>> a 'sin6_scope_id != 0'. 'sin6_scope_id != 0' was enforced in case
>> of link-local addresses. To support interface-local multicast these
>> checks had to be enhanced and are now consolidated into these new helper
>> functions.
>>
>> v2:
>> a) migrated to struct ipv6_addr_props
>>
>> v3:
>> a) reverted changes for ipv6_addr_props
>> b) test for address type instead of comparing scope
>>
>> v4:
>> a) unchanged
>>
>> Suggested-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
...
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v4 3/4] ipv6: stop multicast forwarding to process interface scoped addresses
From: David Miller @ 2013-03-08 17:28 UTC (permalink / raw)
To: yoshfuji; +Cc: netdev
In-Reply-To: <513A121C.7010702@linux-ipv6.org>
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Sat, 09 Mar 2013 01:30:20 +0900
> Hannes Frederic Sowa wrote:
>> v2:
>> a) used struct ipv6_addr_props
>>
>> v3:
>> a) reverted changes for ipv6_addr_props
>>
>> v4:
>> a) do not use __ipv6_addr_needs_scope_id
>>
>> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
...
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
>
> And I think this should go to -stable as well,.
Applied to 'net' and queued up for -stable, thanks.
^ permalink raw reply
* Re: TCP small packets throughput and multiqueue virtio-net
From: Rick Jones @ 2013-03-08 17:26 UTC (permalink / raw)
To: Eric Dumazet
Cc: Jason Wang, netdev, Michael S. Tsirkin, KVM, David Miller,
Stephen Hemminger, jpirko
In-Reply-To: <1362755115.15793.236.camel@edumazet-glaptop>
>
> Well, the point is : if your app does write(1024) bytes, thats probably
> because it wants small packets from the very beginning. (See the TCP
> PUSH flag ?)
I think that raises the question of whether or not Jason was setting the
test-specific -D option on his TCP_STREAM tests, to have netperf make a
setsockopt(TCP_NODELAY) call.
happy benchmarking,
rick jones
> If the transport is slow, TCP stack will automatically collapse several
> write into single skbs (assuming TSO or GSO is on), and you'll see big
> GSO packets with tcpdump [1]. So TCP will help you to get less overhead
> in this case.
>
> But if transport is fast, you'll see small packets, and thats good for
> latency.
>
> So my opinion is : its exactly behaving as expected.
>
> If you want bigger packets either :
> - Make the application doing big write()
> - Slow the vmexit ;)
>
> [1] GSO fools tcpdump : Actual packets sent to the wire are not 'big
> packets', but they hit dev_hard_start_xmit() as GSO packets.
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* Re: [PATCH] VSOCK: Split vm_sockets.h into kernel/uapi
From: David Miller @ 2013-03-08 17:26 UTC (permalink / raw)
To: dhowells; +Cc: acking, pv-drivers, gregkh, linux-kernel, virtualization, netdev
In-Reply-To: <29364.1362704958@warthog.procyon.org.uk>
From: David Howells <dhowells@redhat.com>
Date: Fri, 08 Mar 2013 01:09:18 +0000
> Greg KH <gregkh@linuxfoundation.org> wrote:
>
>> David, is there any rush to get stuff like this into 3.9 for any
>> uapi-type changes, or can it just wait for 3.10?
>
> Not especially. It won't appear in userspace due to the __KERNEL__ guards.
I've applied this to net-next, thanks.
^ permalink raw reply
* Re: [net-next 00/15][pull request] Intel Wired LAN Driver Updates
From: David Miller @ 2013-03-08 17:25 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
In-Reply-To: <1362737237-13363-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 8 Mar 2013 02:07:02 -0800
> This series contains updates to ixgbevf and e1000e.
>
> Alex's ixgbevf patch is meant to address several race issues that become
> possible because next_to_watch could possibly be set to a value that shows
> that the descriptor is done when it is not. In order to correct that we
> instead make next_to_watch a pointer that is set to NULL during cleanup,
> and set to the eop_desc after the descriptor rings have been written.
>
> Stephen's ixgbevf patch makes the PCI id table a const and reformats the
> table to match what the ixgbe driver does.
>
> The remaining 13 patches from Bruce are cleanup patches for e1000e to
> resolve checkpatch.pl warnings/errors, removing blank lines where
> necessary and fix code formatting.
>
> The following are changes since commit 7f0e44ac9f7f12a2519bfed9ea4df3c1471bd8bb:
> ipv6 flowlabel: add __rcu annotations
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply
* [PATCH] rrunner.c: fix possible memory leak in rr_init_one()
From: David Oostdyk @ 2013-03-08 17:23 UTC (permalink / raw)
To: netdev; +Cc: jes, daveo
[-- Attachment #1: Type: text/plain, Size: 770 bytes --]
In the event that register_netdev() failed, the rrpriv->evt_ring
allocation would have not been freed.
Signed-off-by: David Oostdyk <daveo@ll.mit.edu>
---
drivers/net/hippi/rrunner.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index d471963..970595a 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -203,6 +203,9 @@ static int __devinit rr_init_one(struct pci_dev *pdev,
return 0;
out:
+ if (rrpriv->evt_ring)
+ pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
+ rrpriv->evt_ring_dma);
if (rrpriv->rx_ring)
pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
rrpriv->rx_ring_dma);
--
1.8.1.5
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4567 bytes --]
^ permalink raw reply related
* Re: [PATCH] bridging: fix rx_handlers return code
From: David Miller @ 2013-03-08 17:20 UTC (permalink / raw)
To: eric.dumazet; +Cc: B43982, netdev
In-Reply-To: <1362762850.15793.245.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 08 Mar 2013 09:14:10 -0800
> On Fri, 2013-03-08 at 19:03 +0200, Cristian Bercaru wrote:
>> The frames for which rx_handlers return RX_HANDLER_CONSUMED are no longer
>> counted as dropped. They are counted as successfully received by
>> 'netif_receive_skb'.
>>
>> This allows network interface drivers to correctly update their RX-OK and
>> RX-DRP counters based on the result of 'netif_receive_skb'.
>>
>> Signed-off-by: Cristian Bercaru <B43982@freescale.com>
>> ---
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] bridging: fix rx_handlers return code
From: Eric Dumazet @ 2013-03-08 17:14 UTC (permalink / raw)
To: Cristian Bercaru; +Cc: davem, netdev
In-Reply-To: <1362762218-5198-1-git-send-email-B43982@freescale.com>
On Fri, 2013-03-08 at 19:03 +0200, Cristian Bercaru wrote:
> The frames for which rx_handlers return RX_HANDLER_CONSUMED are no longer
> counted as dropped. They are counted as successfully received by
> 'netif_receive_skb'.
>
> This allows network interface drivers to correctly update their RX-OK and
> RX-DRP counters based on the result of 'netif_receive_skb'.
>
> Signed-off-by: Cristian Bercaru <B43982@freescale.com>
> ---
Signed-off-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply
* [PATCH] bridging: fix rx_handlers return code
From: Cristian Bercaru @ 2013-03-08 17:03 UTC (permalink / raw)
To: davem; +Cc: Cristian Bercaru, eric.dumazet, netdev
The frames for which rx_handlers return RX_HANDLER_CONSUMED are no longer
counted as dropped. They are counted as successfully received by
'netif_receive_skb'.
This allows network interface drivers to correctly update their RX-OK and
RX-DRP counters based on the result of 'netif_receive_skb'.
Signed-off-by: Cristian Bercaru <B43982@freescale.com>
---
net/core/dev.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index 9610389..609ac45 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3444,6 +3444,7 @@ ncls:
}
switch (rx_handler(&skb)) {
case RX_HANDLER_CONSUMED:
+ ret = NET_RX_SUCCESS;
goto unlock;
case RX_HANDLER_ANOTHER:
goto another_round;
--
1.7.11.7
^ permalink raw reply related
* Re: [PATCH] netlabel: fix build problems when CONFIG_IPV6=n
From: David Miller @ 2013-03-08 16:34 UTC (permalink / raw)
To: pmoore; +Cc: netdev, fengguang.wu
In-Reply-To: <20130308144539.16729.15070.stgit@localhost>
From: Paul Moore <pmoore@redhat.com>
Date: Fri, 08 Mar 2013 09:45:39 -0500
> My last patch to solve a problem where the static/fallback labels were
> not fully displayed resulted in build problems when IPv6 was disabled.
> This patch resolves the IPv6 build problems; sorry for the screw-up.
>
> Please queue for -stable or simply merge with the previous patch.
>
> Reported-by: Kbuild Test Robot <fengguang.wu@intel.com>
> Signed-off-by: Paul Moore <pmoore@redhat.com>
Applied, and I'll make sure to integrate into the -stable submission
of the original patch.
Thanks.
^ permalink raw reply
* Re: [PATCH net-next] ipv6: ndisc: remove redundant check for !dev->addr_len
From: YOSHIFUJI Hideaki @ 2013-03-08 16:31 UTC (permalink / raw)
To: davem; +Cc: Thomas Graf, netdev, YOSHIFUJI Hideaki
In-Reply-To: <85f9fbce9b5a6ccc4e75b05dab268076e0574abf.1362740080.git.tgraf@suug.ch>
Thomas Graf wrote:
> send_sllao is already initialized with the value of dev->addr_len
>
> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
> Signed-off-by: Thomas Graf <tgraf@suug.ch>
> ---
> net/ipv6/ndisc.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
> index 76ef435..2712ab2 100644
> --- a/net/ipv6/ndisc.c
> +++ b/net/ipv6/ndisc.c
> @@ -610,8 +610,6 @@ void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr,
> }
> }
> #endif
> - if (!dev->addr_len)
> - send_sllao = 0;
> if (send_sllao)
> optlen += ndisc_opt_addr_space(dev);
>
>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
^ permalink raw reply
* Re: [PATCH net-next v4 4/4] ipv6: report sin6_scope_id if sockopt RECVORIGDSTADDR is set
From: YOSHIFUJI Hideaki @ 2013-03-08 16:30 UTC (permalink / raw)
To: netdev, David Miller, YOSHIFUJI Hideaki
In-Reply-To: <20130308120726.GA5174@order.stressinduktion.org>
Hannes Frederic Sowa wrote:
> v4:
> a) unchanged
>
> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
> ---
> net/ipv6/datagram.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
> index b55e70a..4b56cbb 100644
> --- a/net/ipv6/datagram.c
> +++ b/net/ipv6/datagram.c
> @@ -594,7 +594,9 @@ int ip6_datagram_recv_ctl(struct sock *sk, struct msghdr *msg,
> sin6.sin6_addr = ipv6_hdr(skb)->daddr;
> sin6.sin6_port = ports[1];
> sin6.sin6_flowinfo = 0;
> - sin6.sin6_scope_id = 0;
> + sin6.sin6_scope_id =
> + ipv6_iface_scope_id(&ipv6_hdr(skb)->daddr,
> + opt->iif);
>
> put_cmsg(msg, SOL_IPV6, IPV6_ORIGDSTADDR, sizeof(sin6), &sin6);
> }
>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
^ 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