* Re: [PATCH net-2.6] llc: fix a device refcount imbalance
From: David Miller @ 2010-12-08 17:59 UTC (permalink / raw)
To: eric.dumazet
Cc: maximlevitsky, linux1394-devel, stefanr, netdev, kuznet, jmorris,
kaber, opurdila, stable
In-Reply-To: <1291550606.2806.237.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 05 Dec 2010 13:03:26 +0100
> [PATCH net-2.6] llc: fix a device refcount imbalance
>
> commit abf9d537fea225 (llc: add support for SO_BINDTODEVICE) added one
> refcount imbalance in llc_ui_bind(), because dev_getbyhwaddr() doesnt
> take a reference on device, while dev_get_by_index() does.
>
> Fix this using RCU locking. And since an RCU conversion will be done for
> 2.6.38 for dev_getbyhwaddr(), put the rcu_read_lock/unlock exactly at
> their final place.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied and queued up for -stable.
^ permalink raw reply
* Re: net-next-2.6 [PATCH 0/2] dccp: Policy-based packet dequeueing interface
From: David Miller @ 2010-12-08 18:01 UTC (permalink / raw)
To: gerrit; +Cc: dccp, netdev
In-Reply-To: <1291621444-5927-1-git-send-email-gerrit@erg.abdn.ac.uk>
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Mon, 6 Dec 2010 08:44:02 +0100
> Hi Dave,
>
> please find attached a self-contained 2-patch set by Tomasz which adds an API
> to influence DCCP packet dequeueing. It evolved from discussions in 2008,
> adding and adds basic building blocks for sending congestion controlled
> multimedia packets that have a priority or a deadline attached to them.
>
> Occasionally people still make new suggestions for such an API, apparently
> overlooking the excellent work Tomasz has done and which has been in the
> test tree for two years.
>
> Patch #1: introduces the new policy-based packet dequeueing infrastructure.
> Patch #2: adds parameter (sanity) checking of cmsg qpolicy parameters.
>
> I have also placed this in into a fresh (today's) copy of net-next-2.6, on
>
> git://eden-feed.erg.abdn.ac.uk/net-next-2.6 [subtree 'dccp']
>
> The set is fully bisectable.
Looks good, pulled, thanks a lot!
^ permalink raw reply
* Re: [net-next-2.6 PATCH] enic: Add ndo_set_rx_mode support for enic vnics
From: David Miller @ 2010-12-08 18:02 UTC (permalink / raw)
To: roprabhu; +Cc: netdev
In-Reply-To: <20101205062336.28056.72156.stgit@savbu-pc100.cisco.com>
From: Roopa Prabhu <roprabhu@cisco.com>
Date: Sat, 04 Dec 2010 22:23:36 -0800
> From: Roopa Prabhu <roprabhu@cisco.com>
>
> Add ndo_set_rx_mode support to register unicast and multicast address filters for enic vnics
>
> Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
> Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
> Signed-off-by: David Wang <dwang2@cisco.com>
> Signed-off-by: Christian Benvenuti <benve@cisco.com>
This patch does not apply to net-next-2.6, please respin this.
Thanks.
^ permalink raw reply
* Re: [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
From: David Miller @ 2010-12-08 18:05 UTC (permalink / raw)
To: eric.dumazet
Cc: maximlevitsky, linux1394-devel, stefanr, netdev, kuznet, jmorris,
kaber
In-Reply-To: <1291548233.2806.212.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 05 Dec 2010 12:23:53 +0100
> [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
>
> dev_getbyhwaddr() was called under RTNL.
>
> Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
> RCU locking instead of RTNL.
>
> Change arp_ioctl() to use RCU instead of RTNL locking.
>
> Note: this fix a dev refcount bug in llc
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
From: Eric Dumazet @ 2010-12-08 18:07 UTC (permalink / raw)
To: David Miller
Cc: maximlevitsky, linux1394-devel, stefanr, netdev, kuznet, jmorris,
kaber
In-Reply-To: <20101208.100528.193703457.davem@davemloft.net>
Le mercredi 08 décembre 2010 à 10:05 -0800, David Miller a écrit :
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Sun, 05 Dec 2010 12:23:53 +0100
>
> > [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
> >
> > dev_getbyhwaddr() was called under RTNL.
> >
> > Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
> > RCU locking instead of RTNL.
> >
> > Change arp_ioctl() to use RCU instead of RTNL locking.
> >
> > Note: this fix a dev refcount bug in llc
> >
> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>
> Applied, thanks Eric.
Hmm, dont you want I resubmit it after the "llc: fix a device refcount
imbalance" patch pulled from net-2.6 ?
Sorry for the mess...
^ permalink raw reply
* Re: [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
From: David Miller @ 2010-12-08 18:10 UTC (permalink / raw)
To: eric.dumazet
Cc: maximlevitsky, linux1394-devel, stefanr, netdev, kuznet, jmorris,
kaber
In-Reply-To: <1291831654.2883.66.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 08 Dec 2010 19:07:34 +0100
> Le mercredi 08 décembre 2010 à 10:05 -0800, David Miller a écrit :
>> From: Eric Dumazet <eric.dumazet@gmail.com>
>> Date: Sun, 05 Dec 2010 12:23:53 +0100
>>
>> > [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
>> >
>> > dev_getbyhwaddr() was called under RTNL.
>> >
>> > Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use
>> > RCU locking instead of RTNL.
>> >
>> > Change arp_ioctl() to use RCU instead of RTNL locking.
>> >
>> > Note: this fix a dev refcount bug in llc
>> >
>> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
>>
>> Applied, thanks Eric.
>
> Hmm, dont you want I resubmit it after the "llc: fix a device refcount
> imbalance" patch pulled from net-2.6 ?
>
> Sorry for the mess...
I know about the conflict and will resolve it when I do a merge in
the next hour or so.
Don't worry about this.
^ permalink raw reply
* Re: [PATCH] atm: correct sysfs 'device' link creation and parent relationships
From: David Miller @ 2010-12-08 18:11 UTC (permalink / raw)
To: kay.sievers; +Cc: dcbw, netdev, duncan.sands, linux-usb, chas
In-Reply-To: <AANLkTikhkVPcibAH8cSRvZSLop=Ew19Tn=KtY7prkKUn@mail.gmail.com>
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 7 Dec 2010 08:35:53 +0100
> On Sun, Dec 5, 2010 at 23:17, Dan Williams <dcbw@redhat.com> wrote:
>> The ATM subsystem was incorrectly creating the 'device' link for ATM
>> nodes in sysfs. This led to incorrect device/parent relationships
>> exposed by sysfs and udev. Instead of rolling the 'device' link by hand
>> in the generic ATM code, pass each ATM driver's bus device down to the
>> sysfs code and let sysfs do this stuff correctly.
>
> Looks good to me.
I've applied this to net-2.6, thanks Dan.
^ permalink raw reply
* Re: [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl()
From: Eric Dumazet @ 2010-12-08 18:11 UTC (permalink / raw)
To: David Miller
Cc: maximlevitsky, linux1394-devel, stefanr, netdev, kuznet, jmorris,
kaber
In-Reply-To: <20101208.101035.226775926.davem@davemloft.net>
Le mercredi 08 décembre 2010 à 10:10 -0800, David Miller a écrit :
> I know about the conflict and will resolve it when I do a merge in
> the next hour or so.
>
> Don't worry about this.
Ah thats great, thanks !
^ permalink raw reply
* Re: [PATCH] econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
From: David Miller @ 2010-12-08 18:14 UTC (permalink / raw)
To: nelhage; +Cc: philb, netdev, stable
In-Reply-To: <1291589152-4640-1-git-send-email-nelhage@ksplice.com>
From: Nelson Elhage <nelhage@ksplice.com>
Date: Sun, 5 Dec 2010 17:45:52 -0500
> We need to drop the mutex and do a dev_put, so set an error code and break like
> the other paths, instead of returning directly.
>
> Cc: stable@kernel.org
> Signed-off-by: Nelson Elhage <nelhage@ksplice.com>
Applied, thanks Nelson.
^ permalink raw reply
* Re: [patch] econet: unlock on -EPERM path
From: David Miller @ 2010-12-08 18:14 UTC (permalink / raw)
To: error27; +Cc: netdev, philb, eric.dumazet, kernel-janitors
In-Reply-To: <20101207110138.GM10623@bicker>
From: Dan Carpenter <error27@gmail.com>
Date: Tue, 7 Dec 2010 14:01:38 +0300
> We need to do a mutex_unlock() and a put_dev() before returning.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Nelson Elhage beat you to this one, so I integrates his version.
Thanks.
^ permalink raw reply
* Re: [PATCH net-next-2.6] pktgen: adding prefetchw() call
From: David Miller @ 2010-12-08 18:17 UTC (permalink / raw)
To: junchangwang
Cc: eric.dumazet, robert.olsson, john.r.fastabend, andy.shevchenko,
netdev
In-Reply-To: <20101206063349.GA6147@Desktop-Junchang>
From: Junchang Wang <junchangwang@gmail.com>
Date: Mon, 6 Dec 2010 14:33:52 +0800
>
> We know for sure pktgen is going to write skb->data right after
> *_alloc_skb, causing unnecessary cache misses.
>
> Idea is to add a prefetchw() call to prefetch the first cache line
> indicated by skb->data. On systems with Adjacent Cache Line Prefetch,
> it's probably two cache lines are prefetched.
>
> With this prefetch, pktgen on Intel SR1625 server with two E5530
> quad-core processors and a single ixgbe-based NIC went from 8.63Mpps
> to 9.03Mpps, with 4.6% improvement.
>
>
> Signed-off-by: Junchang Wang <junchangwang@gmail.com>
Your patch was corrupted by your email client, please fix this up
and resubmit.
^ permalink raw reply
* Re: [PATCH v2] net/r8169: Remove the firmware of RTL8111D
From: David Miller @ 2010-12-08 18:20 UTC (permalink / raw)
To: maximlevitsky; +Cc: hayeswang, romieu, netdev, linux-kernel
In-Reply-To: <1291671494.30050.19.camel@maxim-laptop>
From: Maxim Levitsky <maximlevitsky@gmail.com>
Date: Mon, 06 Dec 2010 23:38:14 +0200
> Hayes Wang, maybe you know who is responsible for DVB division in your
> company?
Are you completely kidding me?
Are you for real?
Please do not hijack a discussion about a networking patch to ask
questions like this. Start a new thread on the appropriate mailing
list to ask questions like this.
You aren't commenting on the patch, you aren't giving any kind of
feedback at all on this change, and on top of it YOU QUOTED THE
ENTIRE PATCH.
All of this gets logged into our patch tracking facilities in
patchwork, so now I have to sift through your crap just to review
and work on evaluating this change.
Please never do this ever again.
^ permalink raw reply
* Re: [PATCH v2] via-rhine: hardware VLAN support
From: David Miller @ 2010-12-08 18:24 UTC (permalink / raw)
To: rl; +Cc: netdev, jesse
In-Reply-To: <20101206105940.GA17817@core.hellgate.ch>
From: Roger Luethi <rl@hellgate.ch>
Date: Mon, 6 Dec 2010 11:59:40 +0100
> This patch adds VLAN hardware support for Rhine chips.
>
> The driver uses up to 3 additional bytes of buffer space when extracting
> 802.1Q headers; PKT_BUF_SZ should still be sufficient.
>
> The initial code was provided by David Lv. I reworked it to use standard
> kernel facilities. Coding style clean up mostly follows via-velocity.
>
> Adapted to new interface for VLAN acceleration (per request of Jesse Gross).
>
> Signed-off-by: David Lv <DavidLv@viatech.com.cn>
> Signed-off-by: Roger Luethi <rl@hellgate.ch>
Applied, thanks a lot Roger.
^ permalink raw reply
* Re: [PATCH] l2tp: Fix modalias of l2tp_ip
From: David Miller @ 2010-12-08 18:25 UTC (permalink / raw)
To: mmarek; +Cc: jchapman, netdev, linux-kernel
In-Reply-To: <1291639152-26608-1-git-send-email-mmarek@suse.cz>
From: Michal Marek <mmarek@suse.cz>
Date: Mon, 6 Dec 2010 13:39:12 +0100
> Using the SOCK_DGRAM enum results in
> "net-pf-2-proto-SOCK_DGRAM-type-115", so use the numeric value like it
> is done in net/dccp.
>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
Applied, thank you.
^ permalink raw reply
* Re: [patch 1/1] driver/net/benet: fix be_cmd_multicast_set() memcpy bug
From: David Miller @ 2010-12-08 18:27 UTC (permalink / raw)
To: joe.jin
Cc: sathyap, subbus, sarveshwarb, ajitk, netdev, linux-kernel,
greg.marsden, guru.anbalagane
In-Reply-To: <20101206130059.GA19448@joejin-pc.cn.oracle.com>
From: Joe Jin <joe.jin@oracle.com>
Date: Mon, 6 Dec 2010 21:00:59 +0800
> Hi,
>
> Regarding benet be_cmd_multicast_set() function, now using
> netdev_for_each_mc_addr() helper for mac address copy, but
> when copying to req->mac[] did not increase of the index.
>
> Cc: Sathya Perla <sathyap@serverengines.com>
> Cc: Subbu Seetharaman <subbus@serverengines.com>
> Cc: Sarveshwar Bandi <sarveshwarb@serverengines.com>
> Cc: Ajit Khaparde <ajitk@serverengines.com>
> Signed-off-by: Joe Jin <joe.jin@oracle.com>
Applied, thank you.
^ permalink raw reply
* [PATCH] ehea: Fixing LRO configuration
From: leitao @ 2010-12-08 18:31 UTC (permalink / raw)
To: shemminger; +Cc: davem, netdev, Breno Leitao
In order to set LRO on ehea, the user must set a module parameter, which
is not the standard way to do so. This patch adds a way to set LRO using
the ethtool tool.
Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 75b099c..1f37ee6 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -261,6 +261,13 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
}
+static int ehea_set_flags(struct net_device *dev, u32 data)
+{
+ return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO
+ | ETH_FLAG_TXVLAN
+ | ETH_FLAG_RXVLAN);
+}
+
const struct ethtool_ops ehea_ethtool_ops = {
.get_settings = ehea_get_settings,
.get_drvinfo = ehea_get_drvinfo,
@@ -273,6 +280,8 @@ const struct ethtool_ops ehea_ethtool_ops = {
.get_ethtool_stats = ehea_get_ethtool_stats,
.get_rx_csum = ehea_get_rx_csum,
.set_settings = ehea_set_settings,
+ .get_flags = ethtool_op_get_flags,
+ .set_flags = ehea_set_flags,
.nway_reset = ehea_nway_reset, /* Restart autonegotiation */
};
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index a84c389..c7132e8 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -675,7 +675,7 @@ static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe,
int vlan_extracted = ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) &&
pr->port->vgrp);
- if (use_lro) {
+ if (skb->dev->features && NETIF_F_LRO) {
if (vlan_extracted)
lro_vlan_hwaccel_receive_skb(&pr->lro_mgr, skb,
pr->port->vgrp,
@@ -777,7 +777,7 @@ static int ehea_proc_rwqes(struct net_device *dev,
}
cqe = ehea_poll_rq1(qp, &wqe_index);
}
- if (use_lro)
+ if (dev->features && NETIF_F_LRO)
lro_flush_all(&pr->lro_mgr);
pr->rx_packets += processed;
@@ -3265,6 +3265,9 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
| NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
| NETIF_F_LLTX;
dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
+
+ if (use_lro)
+ dev->features |= NETIF_F_LRO;
INIT_WORK(&port->reset_task, ehea_reset_port);
--
1.7.3.2
^ permalink raw reply related
* Re: [PATCH net-next-2.6] filter: constify sk_run_filter()
From: David Miller @ 2010-12-08 18:34 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1291704609.2769.5.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 07 Dec 2010 07:50:09 +0100
> sk_run_filter() doesnt write on skb, change its prototype to reflect
> this.
>
> Fix two af_packet comments.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next-2.6] net: call dev_queue_xmit_nit() after skb_dst_drop()
From: David Miller @ 2010-12-08 18:38 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1291706359.2769.17.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 07 Dec 2010 08:19:19 +0100
> Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
> after skb_dst_drop() in dev_hard_start_xmit().
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH net-next-2.6] net: call dev_queue_xmit_nit() after skb_dst_drop()
From: David Miller @ 2010-12-08 18:38 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1291717837.2695.13.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 07 Dec 2010 11:30:37 +0100
> Here is V2 of patch :
>
> [PATCH v2 net-next-2.6] net: call dev_queue_xmit_nit() after skb_dst_drop()
Ahh, ok, I just noticed this.
I will make sure to apply this version instead.
Thanks!
^ permalink raw reply
* Re: (Lack of) specification for RX n-tuple filtering
From: Vladislav Zolotarov @ 2010-12-08 18:39 UTC (permalink / raw)
To: Ben Hutchings
Cc: Dimitris Michailidis, Peter Waskiewicz, netdev@vger.kernel.org,
David Miller
In-Reply-To: <1291828940.2560.17.camel@bwh-desktop>
> > The
> > semantics for a specification of the steam is also quite different. For
> > instance, how do u define a rule to drop all packets with source IP
> > address 192.168.10.200 by means of RXNFC?
>
> Something like this, I think:
>
> struct ethtool_rxnfc insert_rule = {
> .cmd = ETHTOOL_SRXCLSRLINS,
> .flow_type = IP_USER_SPEC,
> .fs = {
> .flow_type = IP_USER_SPEC,
> .h_u.usr_ip4_spec = {
> .ip4src = inet_aton("192.168.10.200"),
> .ip_ver = ETH_RX_NFC_IP4
> },
> .m_u.usr_ip4_spec = {
> .ip4dst = 0xffffffff,
> .l4_4_bytes = 0xffffffff,
> .tos = 0xff,
> .proto = 0xff
> },
> .ring_cookie = RX_CLS_FLOW_DISC,
> .location = 0,
> }
> };
>
Aha. Ok. From the remarks in the upstream ethtool.h I see now that
ethtool_rxnfc has quite wide configuration possibilities (including the
above). I missed it before. ;)
Ben, could u, pls., explain me then what's the difference between
defining the rule as u wrote above on top of -N option (nfc) and
defining the rule doing the same thing on top on -U (n-tuple) option and
when I as a user should prefer one option to another? Are they expected
to be implemented differently from FW/HW perspective?
thanks,
vlad
P.S. I see that ethtool.h from the 2.6.36 tree already has the
ethtool_rxnfc that would allow such a filtering definition however from
the man page of the 2.6.36 version of the ethtool package it's unclear
what should be a command line for such a configuration. Is it supported
with the current ethtool version or maybe I'm missing something in a man
page?
^ permalink raw reply
* Re: pull request: sfc-2.6 2010-12-07
From: David Miller @ 2010-12-08 18:41 UTC (permalink / raw)
To: bhutchings; +Cc: netdev, linux-net-drivers
In-Reply-To: <1291758335.21627.22.camel@bwh-desktop>
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 07 Dec 2010 21:45:35 +0000
> On Tue, 2010-12-07 at 21:40 +0000, Ben Hutchings wrote:
>> The following changes since commit 46bcf14f44d8f31ecfdc8b6708ec15a3b33316d9:
>>
>> filter: fix sk_filter rcu handling (2010-12-06 09:29:43 -0800)
>>
>> are available in the git repository at:
>> git://git.kernel.org/linux/kernel/git/bwh/sfc-2.6.git sfc-2.6.37
>
> That should of course be:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6.git sfc-2.6.37
>
> Ben.
Pulled, thanks a lot Ben.
^ permalink raw reply
* Re: [PATCH] af_packet: eliminate pgv_to_page on some arches
From: David Miller @ 2010-12-08 18:44 UTC (permalink / raw)
To: xiaosuo; +Cc: eric.dumazet, jpirko, nhorman, netdev
In-Reply-To: <1291731976-15793-1-git-send-email-xiaosuo@gmail.com>
From: Changli Gao <xiaosuo@gmail.com>
Date: Tue, 7 Dec 2010 22:26:16 +0800
> Some arches don't need flush_dcache_page(), and don't implement it, so
> we can eliminate pgv_to_page() calls on those arches.
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] af_packet: fix freeing pg_vec twice on error path
From: David Miller @ 2010-12-08 18:44 UTC (permalink / raw)
To: xiaosuo; +Cc: eric.dumazet, jpirko, nhorman, netdev
In-Reply-To: <1291734318-17989-1-git-send-email-xiaosuo@gmail.com>
From: Changli Gao <xiaosuo@gmail.com>
Date: Tue, 7 Dec 2010 23:05:18 +0800
> It is introduced in:
> commit 0e3125c755445664f00ad036e4fc2cd32fd52877
> Author: Neil Horman <nhorman@tuxdriver.com>
> Date: Tue Nov 16 10:26:47 2010 -0800
>
> packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4)
>
> Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] ehea: Fixing LRO configuration
From: Ben Hutchings @ 2010-12-08 18:44 UTC (permalink / raw)
To: leitao; +Cc: shemminger, davem, netdev
In-Reply-To: <1291833062-27446-1-git-send-email-leitao@linux.vnet.ibm.com>
On Wed, 2010-12-08 at 16:31 -0200, leitao@linux.vnet.ibm.com wrote:
> In order to set LRO on ehea, the user must set a module parameter, which
> is not the standard way to do so. This patch adds a way to set LRO using
> the ethtool tool.
[...]
> diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
> index a84c389..c7132e8 100644
> --- a/drivers/net/ehea/ehea_main.c
> +++ b/drivers/net/ehea/ehea_main.c
> @@ -675,7 +675,7 @@ static void ehea_proc_skb(struct ehea_port_res *pr, struct ehea_cqe *cqe,
> int vlan_extracted = ((cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) &&
> pr->port->vgrp);
>
> - if (use_lro) {
> + if (skb->dev->features && NETIF_F_LRO) {
Should be & not &&.
> if (vlan_extracted)
> lro_vlan_hwaccel_receive_skb(&pr->lro_mgr, skb,
> pr->port->vgrp,
> @@ -777,7 +777,7 @@ static int ehea_proc_rwqes(struct net_device *dev,
> }
> cqe = ehea_poll_rq1(qp, &wqe_index);
> }
> - if (use_lro)
> + if (dev->features && NETIF_F_LRO)
Ditto.
Ben.
> lro_flush_all(&pr->lro_mgr);
>
> pr->rx_packets += processed;
> @@ -3265,6 +3265,9 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
> | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
> | NETIF_F_LLTX;
> dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
> +
> + if (use_lro)
> + dev->features |= NETIF_F_LRO;
>
> INIT_WORK(&port->reset_task, ehea_reset_port);
>
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply
* Re: [PATCH] isdn/hisax: fix compiler warning on hisax_pci_tbl
From: David Miller @ 2010-12-08 18:51 UTC (permalink / raw)
To: namhyung; +Cc: isdn, netdev, linux-kernel
In-Reply-To: <1291733346-11573-1-git-send-email-namhyung@gmail.com>
From: Namhyung Kim <namhyung@gmail.com>
Date: Tue, 7 Dec 2010 23:49:06 +0900
> Annotate hisax_pci_tbl as '__used' to fix following warning:
>
> CC drivers/isdn/hisax/config.o
> drivers/isdn/hisax/config.c:1920: warning: ‘hisax_pci_tbl’ defined but not used
>
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
This only happens because the hisax driver doesn't actually use this table
for probing. Each sub-driver does it's own thing.
What a mess.
Anyways, applied, thank you.
^ 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