* Re: [net-next-2.6 PATCH 1/3] vlan: adds vlan_dev_select_queue
From: Vasu Dev @ 2010-02-17 22:40 UTC (permalink / raw)
To: David Miller, eric.dumazet; +Cc: jeffrey.t.kirsher, netdev, gospo, vasu.dev
In-Reply-To: <20100217.134330.48386140.davem@davemloft.net>
On Wed, 2010-02-17 at 13:43 -0800, David Miller wrote:
> From: Eric Dumazet <eric.dumazet@gmail.com>
> Date: Wed, 17 Feb 2010 14:51:15 +0100
>
> > This is a bit dangerous and deserves a self contained patch IMHO.
> >
OK, I'll create separate patch for this.
> > I would add for example a
> > BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues)
> >
I'll add this.
> > ------------------
> >
> > For performance reason, we could avoid calling vlan_dev_select_queue()
> > for real devices without ndo_select_queue() handler, this would need to
> > mirror vlan_netdev_ops & vlan_netdev_accel_ops.
> >
This means vlan_netdev_ops & vlan_netdev_accel_ops not to be const
anymore so that vlan_dev_select_queue() could be initialized to vlan ops
based on real dev ndo_select_queue() present or not, should be okay to
be not const anymore. I'll update patch as suggested.
> > It would also make vlan_dev_select_queue shorter and not duplicates
> > internals of net/dev/core.c :
> >
Good reasons.
> > static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff
> > *skb)
> > {
> > struct net_device *rdev = vlan_dev_info(dev)->real_dev;
> > const struct net_device_ops *ops = rdev->netdev_ops;
> >
> > return ops->ndo_select_queue(rdev, skb);
> > }
> >
> >
>
> Jeff, please resubmit this patch set after addressing
> Eric's feedback.
>
I'm updating patches per Eric's feedback to have Jeff resubmit these
patches.
Vasu
^ permalink raw reply
* [net-next-2.6 PATCH] cxgb3: convert to use netdev_for_each_addr
From: Jiri Pirko @ 2010-02-17 22:27 UTC (permalink / raw)
To: netdev; +Cc: davem, divy
Removed whole t3_rx_mode structure and appropriate helpers cause they are no
longer needed.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/cxgb3/common.h | 28 +---------------------------
drivers/net/cxgb3/cxgb3_main.c | 8 ++------
drivers/net/cxgb3/xgmac.c | 15 ++++++++-------
3 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index 6ff356d..fe08a00 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -67,32 +67,6 @@
/* Additional NETIF_MSG_* categories */
#define NETIF_MSG_MMIO 0x8000000
-struct t3_rx_mode {
- struct net_device *dev;
- struct dev_mc_list *mclist;
- unsigned int idx;
-};
-
-static inline void init_rx_mode(struct t3_rx_mode *p, struct net_device *dev,
- struct dev_mc_list *mclist)
-{
- p->dev = dev;
- p->mclist = mclist;
- p->idx = 0;
-}
-
-static inline u8 *t3_get_next_mcaddr(struct t3_rx_mode *rm)
-{
- u8 *addr = NULL;
-
- if (rm->mclist && rm->idx < rm->dev->mc_count) {
- addr = rm->mclist->dmi_addr;
- rm->mclist = rm->mclist->next;
- rm->idx++;
- }
- return addr;
-}
-
enum {
MAX_NPORTS = 2, /* max # of ports */
MAX_FRAME_SIZE = 10240, /* max MAC frame size, including header + FCS */
@@ -746,7 +720,7 @@ void t3_mac_enable_exact_filters(struct cmac *mac);
int t3_mac_enable(struct cmac *mac, int which);
int t3_mac_disable(struct cmac *mac, int which);
int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu);
-int t3_mac_set_rx_mode(struct cmac *mac, struct t3_rx_mode *rm);
+int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev);
int t3_mac_set_address(struct cmac *mac, unsigned int idx, u8 addr[6]);
int t3_mac_set_num_ucast(struct cmac *mac, int n);
const struct mac_stats *t3_mac_update_stats(struct cmac *mac);
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 73622f5..6fd968a 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -324,11 +324,9 @@ void t3_os_phymod_changed(struct adapter *adap, int port_id)
static void cxgb_set_rxmode(struct net_device *dev)
{
- struct t3_rx_mode rm;
struct port_info *pi = netdev_priv(dev);
- init_rx_mode(&rm, dev, dev->mc_list);
- t3_mac_set_rx_mode(&pi->mac, &rm);
+ t3_mac_set_rx_mode(&pi->mac, dev);
}
/**
@@ -339,17 +337,15 @@ static void cxgb_set_rxmode(struct net_device *dev)
*/
static void link_start(struct net_device *dev)
{
- struct t3_rx_mode rm;
struct port_info *pi = netdev_priv(dev);
struct cmac *mac = &pi->mac;
- init_rx_mode(&rm, dev, dev->mc_list);
t3_mac_reset(mac);
t3_mac_set_num_ucast(mac, MAX_MAC_IDX);
t3_mac_set_mtu(mac, dev->mtu);
t3_mac_set_address(mac, LAN_MAC_IDX, dev->dev_addr);
t3_mac_set_address(mac, SAN_MAC_IDX, pi->iscsic.mac_addr);
- t3_mac_set_rx_mode(mac, &rm);
+ t3_mac_set_rx_mode(mac, dev);
t3_link_start(&pi->phy, mac, &pi->link_config);
t3_mac_enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);
}
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index 0c08de5..c142a21 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -297,29 +297,30 @@ static int hash_hw_addr(const u8 * addr)
return hash;
}
-int t3_mac_set_rx_mode(struct cmac *mac, struct t3_rx_mode *rm)
+int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev)
{
u32 val, hash_lo, hash_hi;
struct adapter *adap = mac->adapter;
unsigned int oft = mac->offset;
val = t3_read_reg(adap, A_XGM_RX_CFG + oft) & ~F_COPYALLFRAMES;
- if (rm->dev->flags & IFF_PROMISC)
+ if (dev->flags & IFF_PROMISC)
val |= F_COPYALLFRAMES;
t3_write_reg(adap, A_XGM_RX_CFG + oft, val);
- if (rm->dev->flags & IFF_ALLMULTI)
+ if (dev->flags & IFF_ALLMULTI)
hash_lo = hash_hi = 0xffffffff;
else {
- u8 *addr;
+ struct dev_mc_list *dmi;
int exact_addr_idx = mac->nucast;
hash_lo = hash_hi = 0;
- while ((addr = t3_get_next_mcaddr(rm)))
+ netdev_for_each_mc_addr(dmi, dev)
if (exact_addr_idx < EXACT_ADDR_FILTERS)
- set_addr_filter(mac, exact_addr_idx++, addr);
+ set_addr_filter(mac, exact_addr_idx++,
+ dmi->dmi_addr);
else {
- int hash = hash_hw_addr(addr);
+ int hash = hash_hw_addr(dmi->dmi_addr);
if (hash < 32)
hash_lo |= (1 << hash);
--
1.6.6
^ permalink raw reply related
* [net-next-2.6 PATCH v3 3/3] fs_enet: add FEC TX buffer alignment workaround for MPC5121
From: Anatolij Gustschin @ 2010-02-17 22:08 UTC (permalink / raw)
To: netdev
Cc: linuxppc-dev, David S. Miller, Grant Likely, Detlev Zundel,
Wolfgang Denk, John Rigby, Anatolij Gustschin, Piotr Ziecik
In-Reply-To: <1266418530-2727-4-git-send-email-agust@denx.de>
MPC5121 FEC requeries 4-byte alignmnent for TX data buffers.
This patch is a work around that copies misaligned tx packets
to an aligned skb before sending.
Signed-off-by: John Rigby <jcrigby@gmail.com>
Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
Changes since v2:
- ratelimit warning message
- use skb->len + 4 as size for allocation of the new skb
with aligned buffer.
drivers/net/fs_enet/fs_enet-main.c | 47 ++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 4297021..0770e2f 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -580,6 +580,40 @@ void fs_cleanup_bds(struct net_device *dev)
/**********************************************************************************/
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+/*
+ * MPC5121 FEC requeries 4-byte alignment for TX data buffer!
+ */
+static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
+ struct sk_buff *skb)
+{
+ struct sk_buff *new_skb;
+ struct fs_enet_private *fep = netdev_priv(dev);
+
+ /* Alloc new skb */
+ new_skb = dev_alloc_skb(skb->len + 4);
+ if (!new_skb) {
+ if (net_ratelimit()) {
+ dev_warn(fep->dev,
+ "Memory squeeze, dropping tx packet.\n");
+ }
+ return NULL;
+ }
+
+ /* Make sure new skb is properly aligned */
+ skb_align(new_skb, 4);
+
+ /* Copy data to new skb ... */
+ skb_copy_from_linear_data(skb, new_skb->data, skb->len);
+ skb_put(new_skb, skb->len);
+
+ /* ... and free an old one */
+ dev_kfree_skb_any(skb);
+
+ return new_skb;
+}
+#endif
+
static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct fs_enet_private *fep = netdev_priv(dev);
@@ -588,6 +622,19 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
u16 sc;
unsigned long flags;
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+ if (((unsigned long)skb->data) & 0x3) {
+ skb = tx_skb_align_workaround(dev, skb);
+ if (!skb) {
+ /*
+ * We have lost packet due to memory allocation error
+ * in tx_skb_align_workaround(). Hopefully original
+ * skb is still valid, so try transmit it later.
+ */
+ return NETDEV_TX_BUSY;
+ }
+ }
+#endif
spin_lock_irqsave(&fep->tx_lock, flags);
/*
--
1.6.3.3
^ permalink raw reply related
* [net-next-2.6 PATCH] chelsio: convert to use netdev_for_each_mc_addr
From: Jiri Pirko @ 2010-02-17 21:56 UTC (permalink / raw)
To: netdev; +Cc: davem
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/chelsio/common.h | 16 ++--------------
drivers/net/chelsio/cxgb2.c | 2 --
drivers/net/chelsio/pm3393.c | 6 +++---
3 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index bb159d9..9f89fd6 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -90,25 +90,13 @@
typedef struct adapter adapter_t;
struct t1_rx_mode {
- struct net_device *dev;
- u32 idx;
- struct dev_mc_list *list;
+ struct net_device *dev;
};
#define t1_rx_mode_promisc(rm) (rm->dev->flags & IFF_PROMISC)
#define t1_rx_mode_allmulti(rm) (rm->dev->flags & IFF_ALLMULTI)
#define t1_rx_mode_mc_cnt(rm) (netdev_mc_count(rm->dev))
-
-static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
-{
- u8 *addr = NULL;
-
- if (rm->idx++ < t1_rx_mode_mc_cnt(rm)) {
- addr = rm->list->dmi_addr;
- rm->list = rm->list->next;
- }
- return addr;
-}
+#define t1_get_netdev(rm) (rm->dev)
#define MAX_NPORTS 4
#define PORT_MASK ((1 << MAX_NPORTS) - 1)
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 082cdb2..a54a32b 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -125,8 +125,6 @@ static void t1_set_rxmode(struct net_device *dev)
struct t1_rx_mode rm;
rm.dev = dev;
- rm.idx = 0;
- rm.list = dev->mc_list;
mac->ops->set_rx_mode(mac, &rm);
}
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 2117c4f..33d674f 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -375,12 +375,12 @@ static int pm3393_set_rx_mode(struct cmac *cmac, struct t1_rx_mode *rm)
rx_mode |= SUNI1x10GEXP_BITMSK_RXXG_MHASH_EN;
} else if (t1_rx_mode_mc_cnt(rm)) {
/* Accept one or more multicast(s). */
- u8 *addr;
+ struct dev_mc_list *dmi;
int bit;
u16 mc_filter[4] = { 0, };
- while ((addr = t1_get_next_mcaddr(rm))) {
- bit = (ether_crc(ETH_ALEN, addr) >> 23) & 0x3f; /* bit[23:28] */
+ netdev_for_each_mc_addr(dmi, t1_get_netdev(rm)) {
+ bit = (ether_crc(ETH_ALEN, dmi->dmi_addr) >> 23) & 0x3f; /* bit[23:28] */
mc_filter[bit >> 4] |= 1 << (bit & 0xf);
}
pmwrite(cmac, SUNI1x10GEXP_REG_RXXG_MULTICAST_HASH_LOW, mc_filter[0]);
--
1.6.6
^ permalink raw reply related
* Re: [PATCH V3 net-next 0/2] usbnet: Use (netdev|netif)_<level> macros
From: David Miller @ 2010-02-17 21:54 UTC (permalink / raw)
To: joe; +Cc: david-b, gregkh, tilman, netdev, linux-usb, linux-kernel
In-Reply-To: <1266443067.8446.179.camel@Joe-Laptop.home>
From: Joe Perches <joe@perches.com>
Date: Wed, 17 Feb 2010 13:44:27 -0800
> On Wed, 2010-02-17 at 13:38 -0800, David Miller wrote:
>> 'allmodconfig' works well for build testing. :-)
>
> And takes ~6 hours on my netbook ;)
Takes ~6 minutes here :-)
Well, if you're making network device changes, having all of
the wired and wireless drivers enabled in your build is probably
a pretty good idea and should take only 1 hour on your laptop :)
A 6 fold increase!
> Do you know of an ssh-able test build system?
Besides the set of Niagara boxes I have here in my laundry room, no
sorry :-)
^ permalink raw reply
* Re: [net-next-2.6 PATCH 01/18] igb: remove unecessary q_vector declarations and remove itr_shift
From: David Miller @ 2010-02-17 21:51 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, alexander.h.duyck
In-Reply-To: <20100217105953.17723.36633.stgit@localhost.localdomain>
All 18 patches applied to net-next-2.6, thanks!
^ permalink raw reply
* Re: [PATCH] ipmr: remove useless checks from ipmr_device_event
From: David Miller @ 2010-02-17 21:51 UTC (permalink / raw)
To: xemul; +Cc: netdev
In-Reply-To: <4B7BD0C4.3090304@openvz.org>
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 17 Feb 2010 14:19:32 +0300
> The net being checked there is dev_net(dev) and thus this if
> is always false.
>
> Fits both net and net-next trees.
>
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Applied to net-next-2.6
^ permalink raw reply
* Re: [PATCH net-next-2.6 4/4] be2net: implement pci shutdown handler
From: David Miller @ 2010-02-17 21:50 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100217113537.GA20272@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Wed, 17 Feb 2010 17:05:37 +0530
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
...
> + pci_disable_device(pdev);
> +
Trailing whitespace which I fixed up.
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 3/4] be2net: fix rx-path to ignore a flush completion
From: David Miller @ 2010-02-17 21:50 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100217113526.GA20173@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Wed, 17 Feb 2010 17:05:26 +0530
> The flush compl (compl with numfrags == 0; no data) is rcvd
> from hw to indicate completion of RXQ destory operation. Fix
> the RX path to not process it as RX data.
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
...
> if (q->created) {
> be_cmd_q_destroy(adapter, q, QTYPE_RXQ);
> +
Trailing whitespace, which I fixed up.
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 2/4] be2net: don't rearm mcc cq when device is not open
From: David Miller @ 2010-02-17 21:50 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100217113511.GA19873@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Wed, 17 Feb 2010 17:05:11 +0530
> When an MCC cmd is issued (via a netdev/ethtool op)
> while the device is not open, the MCC CQ gets processed but the EQ
> is not processed (as isr is not registered.) This can cause the EQ
> to become full. So, while the device is not open, CQ must not be re-armed
> to prevent EQ entries.
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/4] be2net: a mini optimization in rx_compl_process() code
From: David Miller @ 2010-02-17 21:49 UTC (permalink / raw)
To: sathyap; +Cc: netdev
In-Reply-To: <20100217113422.GA19674@serverengines.com>
From: Sathya Perla <sathyap@serverengines.com>
Date: Wed, 17 Feb 2010 17:04:22 +0530
> Introduce unlikely() for skb alloc failure and vlanf checks...
>
> Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Applied.
^ permalink raw reply
* Re: [RFC PATCH net-next-2.6]: xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR
From: David Miller @ 2010-02-17 21:49 UTC (permalink / raw)
To: hadi; +Cc: nakam, kaber, herbert, netdev
In-Reply-To: <1266406852.3799.7.camel@bigi>
From: jamal <hadi@cyberus.ca>
Date: Wed, 17 Feb 2010 06:40:52 -0500
> xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR
>
> XFRMINHDRERROR counter is ambigous when validating forwarding
> path. It makes it tricky to debug when you have both in and fwd
> validation.
>
> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
This should be fine, the tools just parse the lines individually
as "string integer" pairs.
If you want to be super anal, add the new counter to the end of
the array.
^ permalink raw reply
* Re: [PATCH 0/8]: Bug fixes and new FW patch series
From: David Miller @ 2010-02-17 21:44 UTC (permalink / raw)
To: vladz; +Cc: netdev
In-Reply-To: <1266408196.25691.841.camel@lb-tlvb-vladz>
From: "Vladislav Zolotarov" <vladz@broadcom.com>
Date: Wed, 17 Feb 2010 14:03:16 +0200
> Dave, hi.
> Pls., apply the following series of patches.
> It includes a few bugs fixes and a few FW.
>
> The patches may also be found at
> http://linux.broadcom.com/eilong/1.52.1-6
All applied, but please coordinate better with changes coming in via
your colleages.
Patch #6 would not apply cleanly because the firmware/Makefile is
different due to the bnx2 driver firmware updates made yesterday.
I fixed it up by hand, but in the future apply patches that apply
cleanly to the current tree.
Thanks.
^ permalink raw reply
* Re: [PATCH V3 net-next 0/2] usbnet: Use (netdev|netif)_<level> macros
From: Joe Perches @ 2010-02-17 21:44 UTC (permalink / raw)
To: David Miller; +Cc: david-b, gregkh, tilman, netdev, linux-usb, linux-kernel
In-Reply-To: <20100217.133846.181531049.davem@davemloft.net>
On Wed, 2010-02-17 at 13:38 -0800, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Wed, 17 Feb 2010 12:30:22 -0800
> > Sorry 'bout that.
> > I'll try to improve my insufficient grep and build testing.
> 'allmodconfig' works well for build testing. :-)
And takes ~6 hours on my netbook ;)
I try to avoid it.
Do you know of an ssh-able test build system?
cheers, Joe
^ permalink raw reply
* Re: [net-next-2.6 PATCH 1/3] vlan: adds vlan_dev_select_queue
From: David Miller @ 2010-02-17 21:43 UTC (permalink / raw)
To: eric.dumazet; +Cc: jeffrey.t.kirsher, netdev, gospo, vasu.dev
In-Reply-To: <1266414675.3246.12.camel@edumazet-laptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 17 Feb 2010 14:51:15 +0100
> This is a bit dangerous and deserves a self contained patch IMHO.
>
> I would add for example a
> BUG_ON(vlandev->real_num_tx_queues > vlandev->num_tx_queues)
>
> ------------------
>
> For performance reason, we could avoid calling vlan_dev_select_queue()
> for real devices without ndo_select_queue() handler, this would need to
> mirror vlan_netdev_ops & vlan_netdev_accel_ops.
>
> It would also make vlan_dev_select_queue shorter and not duplicates
> internals of net/dev/core.c :
>
> static u16 vlan_dev_select_queue(struct net_device *dev, struct sk_buff
> *skb)
> {
> struct net_device *rdev = vlan_dev_info(dev)->real_dev;
> const struct net_device_ops *ops = rdev->netdev_ops;
>
> return ops->ndo_select_queue(rdev, skb);
> }
>
>
Jeff, please resubmit this patch set after addressing
Eric's feedback.
Thanks!
^ permalink raw reply
* Re: regression due to "flush SAD/SPD generate false events"
From: jamal @ 2010-02-17 21:42 UTC (permalink / raw)
To: Alexey Dobriyan; +Cc: davem, netdev
In-Reply-To: <20100217191718.GA5256@x200>
On Wed, 2010-02-17 at 21:17 +0200, Alexey Dobriyan wrote:
> commit 19f4c7133fc1b94001b997c4843d0a9192ee63e5
> xfrm: Flushing empty SAD generates false events
>
> commit 0dca3a843632c2fbb6e358734fb08fc23e800f50
> xfrm: Flushing empty SPD generates false events
>
> setkey now takes several seconds to run this simple script
> and it spits "recv: Resource temporarily unavailable" messages.
I will try to reproduce it in about an hour. Do you have
anything like selinux being used etc?
BTW, the script seems a little strange because i think
the template wont match between the SA/SP.. (doesnt
matter if you are testing insertion/flushing)
Does the following look reasonable for testing?
----
#!/usr/sbin/setkey -f
flush;
spdflush;
add 192.168.1.2 192.168.1.3 ipcomp 44 -m tunnel -C deflate;
add 192.168.1.3 192.168.1.2 ipcomp 45 -m tunnel -C deflate;
spdadd 10.0.1.2 10.1.2.3 any -P in ipsec
ipcomp/tunnel/192.168.1.2-192.168.1.3/use;
spdadd 10.1.2.3 10.0.1.2 any -P out ipsec
ipcomp/tunnel/192.168.1.3-192.168.1.2/use;
-----
cheers,
jamal
^ permalink raw reply
* Re: [PATCH] ll_temac: Fix MAC address configuration from userland
From: David Miller @ 2010-02-17 21:42 UTC (permalink / raw)
To: steve; +Cc: netdev, linux-kernel
In-Reply-To: <1266429307-11765-1-git-send-email-steve@digidescorp.com>
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Wed, 17 Feb 2010 11:55:07 -0600
> A userland command to set the LLTEMAC MAC address,
> i.e. "ifconfig eth0 hw addr xx:yy:zz:pp:dd:qq",
> results in a device address of 00:01:xx:yy:zz:pp.
> Correct this.
>
> Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Applied.
^ permalink raw reply
* Re: [net-next PATCH 0/3] qlge: minor fixes.
From: David Miller @ 2010-02-17 21:42 UTC (permalink / raw)
To: ron.mercer; +Cc: netdev
In-Reply-To: <1266424883-25927-1-git-send-email-ron.mercer@qlogic.com>
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Wed, 17 Feb 2010 08:41:20 -0800
>
> Miscellaneous fixes for qlge:
>
> 1) Fix large ping (non-TCP/UDP) frame dropping when data spans
> multiple rx buffers.
> 2) Fix mac address filter issue for bonding.
> 3) Fix ethtool loopback test.
All applied, thanks.
^ permalink raw reply
* Re: [PATCH] ll_temac: Add support for V2 LLTEMAC core
From: David Miller @ 2010-02-17 21:42 UTC (permalink / raw)
To: steve; +Cc: netdev, linux-kernel
In-Reply-To: <1266426860-5634-1-git-send-email-steve@digidescorp.com>
From: "Steven J. Magnani" <steve@digidescorp.com>
Date: Wed, 17 Feb 2010 11:14:20 -0600
> LLTEMAC V1 cores place only received packet length in the app4 word.
> V2 cores place additional information in app4.
> Mask out the additional information when retrieving the packet length.
>
> Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Applied.
^ permalink raw reply
* Re: regression due to "flush SAD/SPD generate false events"
From: David Miller @ 2010-02-17 21:42 UTC (permalink / raw)
To: adobriyan; +Cc: hadi, netdev
In-Reply-To: <20100217191718.GA5256@x200>
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 17 Feb 2010 21:17:19 +0200
> commit 19f4c7133fc1b94001b997c4843d0a9192ee63e5
> xfrm: Flushing empty SAD generates false events
>
> commit 0dca3a843632c2fbb6e358734fb08fc23e800f50
> xfrm: Flushing empty SPD generates false events
>
> setkey now takes several seconds to run this simple script
> and it spits "recv: Resource temporarily unavailable" messages.
>
> #!/usr/sbin/setkey -f
> flush;
> spdflush;
>
> add A B ipcomp 44 -m tunnel -C deflate;
> add B A ipcomp 45 -m tunnel -C deflate;
>
> spdadd A B any -P in ipsec
> ipcomp/tunnel/192.168.1.2-192.168.1.3/use;
> spdadd B A any -P out ipsec
> ipcomp/tunnel/192.168.1.3-192.168.1.2/use;
Thanks for the report Alexey. I'll revert these changes
for now.
Jamal, if you can find a way to do this without breaking
existing applications feel free to send a new version of
these patches.
Thanks.
^ permalink raw reply
* Re: [PATCH] ethtool: Don't flush n-tuple list from ethtool_reset()
From: David Miller @ 2010-02-17 21:39 UTC (permalink / raw)
To: peter.p.waskiewicz.jr; +Cc: bhutchings, netdev
In-Reply-To: <Pine.WNT.4.64.1002171128350.7212@ppwaskie-MOBL2.amr.corp.intel.com>
From: "Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@intel.com>
Date: Wed, 17 Feb 2010 11:29:33 -0800 (Pacific Standard Time)
> On Wed, 17 Feb 2010, Ben Hutchings wrote:
>
>> The n-tuple list should be flushed if and only if the ETH_RESET_FILTER
>> flag is set and the driver is able to reset filtering/flow direction
>> hardware without also resetting a component whose flag is not set.
>> This test is best left to the driver.
>>
>> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
>
> Yes, this was the intent. Thanks for cleaning this bit up in the ethtool
> core.
Patch applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH net-next-2.6] xt_hashlimit: fix locking
From: David Miller @ 2010-02-17 21:39 UTC (permalink / raw)
To: kaber; +Cc: eric.dumazet, netdev, netfilter-devel
In-Reply-To: <4B7C4CD1.1070105@trash.net>
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 17 Feb 2010 21:08:49 +0100
> Eric Dumazet wrote:
>> Or following quick & dirty patch just cures the problem.
>
> Thanks, this looks fine.
To get this fixed quickly I've applied this directly
to net-next-2.6, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net: use kasprintf() for socket cache names
From: David Miller @ 2010-02-17 21:39 UTC (permalink / raw)
To: adobriyan; +Cc: netdev
In-Reply-To: <20100217193411.GC5256@x200>
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 17 Feb 2010 21:34:12 +0200
> kasprintf() makes code smaller.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH] SiS190/191 half-duplex initialization fix
From: David Miller @ 2010-02-17 21:39 UTC (permalink / raw)
To: birrachiara; +Cc: romieu, netdev
In-Reply-To: <1266434938-11199-1-git-send-email-birrachiara@tin.it>
From: Riccardo Ghetta <birrachiara@tin.it>
Date: Wed, 17 Feb 2010 20:28:58 +0100
> Adds half-duplex specific setup code (taken from SiS own GPL driver).
> Without those, half-duplex connections are very unreliable, often
> working on small transfers and failing after a while.
>
> Signed-off-by: Riccardo Ghetta <birrachiara@tin.it>
Applied.
^ permalink raw reply
* Re: [PATCH V3 net-next 0/2] usbnet: Use (netdev|netif)_<level> macros
From: David Miller @ 2010-02-17 21:38 UTC (permalink / raw)
To: joe; +Cc: david-b, gregkh, tilman, netdev, linux-usb, linux-kernel
In-Reply-To: <cover.1266438216.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Wed, 17 Feb 2010 12:30:22 -0800
> Sorry 'bout that.
> I'll try to improve my insufficient grep and build testing.
'allmodconfig' works well for build testing. :-)
> Added drivers/net/wireless/rndis_wlan.c to conversions.
>
> After this conversion, no uses of the old macros exist in-tree.
>
> Joe Perches (2):
> usbnet: Convert dev(dbg|err|warn|info) macros to netdev_<level>
> drivers/net/usb: Use netif_<level> logging facilities
All 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