* [PATCH] be2net: convert hdr.timeout in be_cmd_loopback_test() to le32
From: Sathya Perla @ 2010-06-01 7:01 UTC (permalink / raw)
To: netdev
The current code fails on ppc as hdr.timeout is not being converted
to le32.
Pls apply to net-2.6.
Signed-off-by: Sathya Perla <sathyap@serverengines.com>
---
drivers/net/benet/be_cmds.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 9e305d7..b9ad799 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1593,7 +1593,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,
be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_LOWLEVEL,
OPCODE_LOWLEVEL_LOOPBACK_TEST, sizeof(*req));
- req->hdr.timeout = 4;
+ req->hdr.timeout = cpu_to_le32(4);
req->pattern = cpu_to_le64(pattern);
req->src_port = cpu_to_le32(port_num);
--
1.6.5.2
^ permalink raw reply related
* [patch 1/2] caif: remove unneeded variable from caif_net_open()
From: Dan Carpenter @ 2010-06-01 7:08 UTC (permalink / raw)
To: Sjur Braendeland; +Cc: netdev, David S. Miller, kernel-janitors
We don't use the "ser" variable so I've removed it.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 09257ca..f30a6a0 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -410,8 +410,6 @@ static void caifdev_setup(struct net_device *dev)
static int caif_net_open(struct net_device *dev)
{
- struct ser_device *ser;
- ser = netdev_priv(dev);
netif_wake_queue(dev);
return 0;
}
^ permalink raw reply related
* [patch 2/2] caif: add newlines after declarations in caif_serial.c
From: Dan Carpenter @ 2010-06-01 7:09 UTC (permalink / raw)
To: Sjur Braendeland; +Cc: netdev, kernel-janitors, David S. Miller
I added newlines after the declarations in caif_serial.c. This is
normal kernel style, although I can't see anywhere it's documented.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index f30a6a0..3e706f0 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -174,6 +174,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
struct ser_device *ser;
int ret;
u8 *p;
+
ser = tty->disc_data;
/*
@@ -221,6 +222,7 @@ static int handle_tx(struct ser_device *ser)
struct tty_struct *tty;
struct sk_buff *skb;
int tty_wr, len, room;
+
tty = ser->tty;
ser->tx_started = true;
@@ -281,6 +283,7 @@ error:
static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct ser_device *ser;
+
BUG_ON(dev == NULL);
ser = netdev_priv(dev);
@@ -299,6 +302,7 @@ static int caif_xmit(struct sk_buff *skb, struct net_device *dev)
static void ldisc_tx_wakeup(struct tty_struct *tty)
{
struct ser_device *ser;
+
ser = tty->disc_data;
BUG_ON(ser == NULL);
BUG_ON(ser->tty != tty);
@@ -348,6 +352,7 @@ static void ldisc_close(struct tty_struct *tty)
struct ser_device *ser = tty->disc_data;
/* Remove may be called inside or outside of rtnl_lock */
int islocked = rtnl_is_locked();
+
if (!islocked)
rtnl_lock();
/* device is freed automagically by net-sysfs */
@@ -374,6 +379,7 @@ static struct tty_ldisc_ops caif_ldisc = {
static int register_ldisc(void)
{
int result;
+
result = tty_register_ldisc(N_CAIF, &caif_ldisc);
if (result < 0) {
pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF,
@@ -391,6 +397,7 @@ static const struct net_device_ops netdev_ops = {
static void caifdev_setup(struct net_device *dev)
{
struct ser_device *serdev = netdev_priv(dev);
+
dev->features = 0;
dev->netdev_ops = &netdev_ops;
dev->type = ARPHRD_CAIF;
@@ -423,6 +430,7 @@ static int caif_net_close(struct net_device *dev)
static int __init caif_ser_init(void)
{
int ret;
+
ret = register_ldisc();
debugfsdir = debugfs_create_dir("caif_serial", NULL);
return ret;
@@ -433,6 +441,7 @@ static void __exit caif_ser_exit(void)
struct ser_device *ser = NULL;
struct list_head *node;
struct list_head *_tmp;
+
list_for_each_safe(node, _tmp, &ser_list) {
ser = list_entry(node, struct ser_device, node);
dev_close(ser->dev);
^ permalink raw reply related
* [PATCH] greth: Fix build after OF device conversions.
From: David Miller @ 2010-06-01 7:10 UTC (permalink / raw)
To: grant.likely; +Cc: netdev
Signed-off-by: David S. Miller <davem@davemloft.net>
---
I've pushed this to net-2.6
drivers/net/greth.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index f37a4c1..3a029d0 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1607,14 +1607,13 @@ static struct of_device_id greth_of_match[] = {
MODULE_DEVICE_TABLE(of, greth_of_match);
static struct of_platform_driver greth_of_driver = {
- .name = "grlib-greth",
- .match_table = greth_of_match,
+ .driver = {
+ .name = "grlib-greth",
+ .owner = THIS_MODULE,
+ .of_match_table = greth_of_match,
+ },
.probe = greth_of_probe,
.remove = __devexit_p(greth_of_remove),
- .driver = {
- .owner = THIS_MODULE,
- .name = "grlib-greth",
- },
};
static int __init greth_init(void)
--
1.7.0.4
^ permalink raw reply related
* Re: [PATCH] can: mpc5xxx_can.c: Fix build failure
From: David Miller @ 2010-06-01 7:11 UTC (permalink / raw)
To: wg; +Cc: agust, socketcan-core, netdev, grant.likely
In-Reply-To: <4C04A6C2.2090705@grandegger.com>
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Tue, 01 Jun 2010 08:20:50 +0200
> On 05/31/2010 08:27 PM, Wolfgang Grandegger wrote:
>> Hi Anatolij,
>>
>> On 05/31/2010 06:31 PM, Anatolij Gustschin wrote:
>>> Fixes build error caused by the OF device_node pointer
>>> being moved into struct device.
>>>
>>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>>> Cc: Wolfgang Grandegger <wg@grandegger.com>
>>> Cc: Grant Likely <grant.likely@secretlab.ca>
>
> Acked-by: Wolfgang Grandegger <wg@grandegger.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 19/21] net/ipv4/igmp.c: Remove unnecessary kmalloc casts
From: David Miller @ 2010-06-01 7:17 UTC (permalink / raw)
To: joe; +Cc: linux-kernel, kuznet, pekkas, jmorris, yoshfuji, kaber, netdev
In-Reply-To: <cac9f44ad085db78698681859236a7c3a0983e49.1275360951.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 20:23:21 -0700
> Signed-off-by: Joe Perches <joe@perches.com>
Applied.
^ permalink raw reply
* Re: [PATCH 20/21] net/ipv6/mcast.c: Remove unnecessary kmalloc casts
From: David Miller @ 2010-06-01 7:17 UTC (permalink / raw)
To: joe; +Cc: linux-kernel, kuznet, pekkas, jmorris, yoshfuji, kaber, netdev
In-Reply-To: <52b8781064af8d4b1051f5ac175f7b7f175ff1ed.1275360951.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 20:23:22 -0700
> Signed-off-by: Joe Perches <joe@perches.com>
Applied.
^ permalink raw reply
* Re: [PATCH 10/21] drivers/net/gianfar.c: Remove unnecessary kmalloc casts
From: David Miller @ 2010-06-01 7:17 UTC (permalink / raw)
To: joe; +Cc: linux-kernel, netdev
In-Reply-To: <787b5a04a6f7f854b0809c4358671d3d69f70efc.1275360951.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 20:23:12 -0700
> Signed-off-by: Joe Perches <joe@perches.com>
Applied.
^ permalink raw reply
* Re: [PATCH 11/21] drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts
From: David Miller @ 2010-06-01 7:17 UTC (permalink / raw)
To: joe; +Cc: linux-kernel, grundler, kyle, netdev
In-Reply-To: <4fc0e008a2fc826c5696c07bf25a68440e36353b.1275360951.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Mon, 31 May 2010 20:23:13 -0700
> Signed-off-by: Joe Perches <joe@perches.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] tulip: explicity set to D0 power state during init
From: David Miller @ 2010-06-01 7:18 UTC (permalink / raw)
To: stevenrwalter; +Cc: grundler, kyle, netdev
In-Reply-To: <1275361913-5630-1-git-send-email-stevenrwalter@gmail.com>
From: Steven Walter <stevenrwalter@gmail.com>
Date: Mon, 31 May 2010 23:11:53 -0400
> During the first suspend the chip would refuse to enter D3. Subsequent
> suspends worked okay. During resume the chip is commanded into D0.
> Doing so during initialization fixes the initial suspend.
>
> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
> Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Applied.
^ permalink raw reply
* Re: [PATCH 2/2] tulip: implement wake-on-lan support
From: David Miller @ 2010-06-01 7:18 UTC (permalink / raw)
To: stevenrwalter; +Cc: grundler, kyle, netdev
In-Reply-To: <1275345283-10650-2-git-send-email-stevenrwalter@gmail.com>
From: Steven Walter <stevenrwalter@gmail.com>
Date: Mon, 31 May 2010 18:34:43 -0400
> Based on a patch from http://simon.baatz.info/wol-support-for-an983b/
>
> Tested to resume from suspend by magic packet.
>
> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] r6040: implement phylib
From: David Miller @ 2010-06-01 7:18 UTC (permalink / raw)
To: florian; +Cc: netdev
In-Reply-To: <201005312118.58728.florian@openwrt.org>
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 31 May 2010 21:18:57 +0200
> This patch adds support for using phylib and adds the required mdiobus driver
> stubs. This allows for less code to be present in the driver and removes
> the PHY status specific timer which is now handled by phylib directly.
>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH 2/2] r6040: bump version to 0.26 and date to 30 May 2010
From: David Miller @ 2010-06-01 7:18 UTC (permalink / raw)
To: florian; +Cc: netdev
In-Reply-To: <201005312119.04553.florian@openwrt.org>
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 31 May 2010 21:19:04 +0200
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH] ixp4xx: Support the all multicast flag on the NPE devices.
From: David Miller @ 2010-06-01 7:18 UTC (permalink / raw)
To: khc; +Cc: richardcochran, netdev, linux-arm-kernel
In-Reply-To: <m3typoyr86.fsf@intrepid.localdomain>
From: Krzysztof Halasa <khc@pm.waw.pl>
Date: Mon, 31 May 2010 18:24:09 +0200
> Richard Cochran <richardcochran@gmail.com> writes:
>
>> This patch adds support for the IFF_ALLMULTI flag. Previously only the
>> IFF_PROMISC flag was supported.
>>
>> Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
...
> Acked-By: Krzysztof Halasa <khc@pm.waw.pl>
Applied.
^ permalink raw reply
* RE: [patch 1/2] caif: remove unneeded variable from caif_net_open()
From: Sjur BRENDELAND @ 2010-06-01 7:19 UTC (permalink / raw)
To: Dan Carpenter
Cc: netdev@vger.kernel.org, David S. Miller,
kernel-janitors@vger.kernel.org
In-Reply-To: <20100601070855.GD5483@bicker>
Dan Carpenter wrote:
> We don't use the "ser" variable so I've removed it.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
Looks good thanks,
Acked-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
^ permalink raw reply
* Re: [PATCH] be2net: convert hdr.timeout in be_cmd_loopback_test() to le32
From: David Miller @ 2010-06-01 7:19 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100601070122.GA2608@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Tue, 1 Jun 2010 12:31:22 +0530
> The current code fails on ppc as hdr.timeout is not being converted
> to le32.
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 1/2] be2net: cleanup in case of error in be_open()
From: David Miller @ 2010-06-01 7:19 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100531093345.GA2812@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Mon, 31 May 2010 15:03:45 +0530
> This patch adds cleanup code (things like unregistering irq,
> disabling napi etc) to be_open() when an error occurs inside the
> routine.
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 2/2] be2net: replace udelay() with schedule_timeout() in mbox polling
From: David Miller @ 2010-06-01 7:19 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100531093414.GA2867@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Mon, 31 May 2010 15:04:14 +0530
> As mbox polling is done only in process context, it is better to
> use schedule_timeout() instead of udelay().
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Applied.
^ permalink raw reply
* Re: [PATCH] virtio-net: pass gfp to add_buf
From: David Miller @ 2010-06-01 7:22 UTC (permalink / raw)
To: rusty; +Cc: netdev, mst
In-Reply-To: <201005312040.01737.rusty@rustcorp.com.au>
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 31 May 2010 20:40:01 +0930
> From: "Michael S. Tsirkin" <mst@redhat.com>
>
> (Dave: the virtqueue_add_buf_gfp is in Linus' tree, so please queue
> this trivial use now. Thanks!)
>
> virtio-net bounces buffer allocations off to
> a thread if it can't allocate buffers from the atomic
> pool. However, if posting buffers still requires atomic
> buffers, this is unlikely to succeed.
> Fix by passing in the proper gfp_t parameter.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Your code sucks, and you're wrong.
Please give me positive feedback and tell me how right I am to pump up
my ego or else I will verbally destroy you and make you feel small.
Applied :-)))))))))))))))
^ permalink raw reply
* Re: [PATCH 1/2] ksz884x: convert to netdev_tx_t
From: David Miller @ 2010-06-01 7:24 UTC (permalink / raw)
To: dkirjanov; +Cc: netdev
In-Reply-To: <20100531102449.GA6617@hera.kernel.org>
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Mon, 31 May 2010 10:24:49 +0000
> Convert TX hook to netdev_tx_t type
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Applied.
^ permalink raw reply
* Re: [PATCH 2/2] ksz884x: Add missing validate_addr hook
From: David Miller @ 2010-06-01 7:24 UTC (permalink / raw)
To: dkirjanov; +Cc: netdev
In-Reply-To: <20100531102621.GA15849@hera.kernel.org>
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Mon, 31 May 2010 10:26:21 +0000
> Add missing validate_addr hook
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Applied, thank you.
^ permalink raw reply
* Re: [PATCH] ipv6: get rid of ipip6_prl_lock
From: David Miller @ 2010-06-01 7:27 UTC (permalink / raw)
To: eric.dumazet
Cc: julia, kuznet, pekkas, jmorris, yoshfuji, kaber, netdev,
linux-kernel, kernel-janitors
In-Reply-To: <1275282295.2472.34.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 31 May 2010 07:04:55 +0200
> [PATCH] ipv6: get rid of ipip6_prl_lock
>
> As noticed by Julia Lawall, ipip6_tunnel_add_prl() incorrectly calls
> kzallloc(..., GFP_KERNEL) while a spinlock is held. She provided
> a patch to use GFP_ATOMIC instead.
>
> One possibility would be to convert this spinlock to a mutex, or
> preallocate the thing before taking the lock.
>
> After RCU conversion, it appears we dont need this lock, since
> caller already holds RTNL
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied, thanks everyone.
^ permalink raw reply
* Re: [patch 1/2] caif: remove unneeded variable from caif_net_open()
From: walter harms @ 2010-06-01 7:27 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Sjur Braendeland, netdev, David S. Miller, kernel-janitors
In-Reply-To: <20100601070855.GD5483@bicker>
Dan Carpenter schrieb:
> We don't use the "ser" variable so I've removed it.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
> index 09257ca..f30a6a0 100644
> --- a/drivers/net/caif/caif_serial.c
> +++ b/drivers/net/caif/caif_serial.c
> @@ -410,8 +410,6 @@ static void caifdev_setup(struct net_device *dev)
>
> static int caif_net_open(struct net_device *dev)
> {
> - struct ser_device *ser;
> - ser = netdev_priv(dev);
> netif_wake_queue(dev);
> return 0;
> }
what makes caif_net_open() obsolet ?
re,
wh
^ permalink raw reply
* Re: [PATCH net-next]atl1c: Add AR8151 v2 support and change L0s/L1 routine
From: David Miller @ 2010-06-01 7:28 UTC (permalink / raw)
To: jie.yang; +Cc: Luis.Rodriguez, netdev, linux-kernel
In-Reply-To: <12752881361777-git-send-email-jie.yang@atheros.com>
From: <jie.yang@atheros.com>
Date: Mon, 31 May 2010 14:42:16 +0800
> From: Jie.Yang@atheros.com
>
> Add AR8151 v2.0 Gigabit 1000 support
> Change jumbo frame size to 6K
> Update L0s/L1 rountine
> when link speed is 100M or 1G, set L1 link timer to 4 for l1d_2 and l2c_b2
> set L1 link timer to 7 for l2c_b, set L1 link timer to 0xF for others.
> Update atl1c_suspend routine
> just refactory the function, add atl1c_phy_power_saving routine,
> when Wake On Lan enable, this func will be called to save power,
> it will reautoneg PHY to 10/100M speed depend on the link
> partners link capability.
> Update atl1c_configure_des_ring
> do not use l2c_b default SRAM configuration.
>
> Signed-off-by: Jie.Yang@atheros.com
Applied, thank you.
^ permalink raw reply
* Re: [PATCH] virtio-net: pass gfp to add_buf
From: Rusty Russell @ 2010-06-01 7:28 UTC (permalink / raw)
To: David Miller; +Cc: netdev, mst
In-Reply-To: <20100601.002246.149820849.davem@davemloft.net>
On Tue, 1 Jun 2010 04:52:46 pm David Miller wrote:
> From: Rusty Russell <rusty@rustcorp.com.au>
> Date: Mon, 31 May 2010 20:40:01 +0930
>
> > From: "Michael S. Tsirkin" <mst@redhat.com>
> >
> > (Dave: the virtqueue_add_buf_gfp is in Linus' tree, so please queue
> > this trivial use now. Thanks!)
> >
> > virtio-net bounces buffer allocations off to
> > a thread if it can't allocate buffers from the atomic
> > pool. However, if posting buffers still requires atomic
> > buffers, this is unlikely to succeed.
> > Fix by passing in the proper gfp_t parameter.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>
> Your code sucks, and you're wrong.
>
> Please give me positive feedback and tell me how right I am to pump up
> my ego or else I will verbally destroy you and make you feel small.
>
> Applied :-)))))))))))))))
Thanks Dave, that made my day :)
Cheers,
Rusty.
^ 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