RE: [git patches] net driver updates #2
Hi, Can somebody point me where could I get the MMU(Memory management Unit) details ? Regards, Pravin -**Nihilent*** " *** All information contained in this communication is confidential, proprietary, privileged and is intended for the addressees only. If youhave received this E-mail in error please notify mail administrator by telephone on +91-20-39846100 or E-mail the sender by replying to this message, and then delete this E-mail and other copies of it from your computer system. Any unauthorized dissemination,publication, transfer or use of the contents of this communication, with or without modifications is punishable under the relevant law. Nihilent has scanned this mail with current virus checking technologies. However, Nihilent makes no representations or warranties to the effect that this communication is virus-free. Nihilent reserves the right to monitor all E-mail communications through its Corporate Network. *** " *- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [git patches] net driver updates #2
Hi, Can somebody point me where could I get the MMU(Memory management Unit) details ? Regards, Pravin -**Nihilent*** *** All information contained in this communication is confidential, proprietary, privileged and is intended for the addressees only. If youhave received this E-mail in error please notify mail administrator by telephone on +91-20-39846100 or E-mail the sender by replying to this message, and then delete this E-mail and other copies of it from your computer system. Any unauthorized dissemination,publication, transfer or use of the contents of this communication, with or without modifications is punishable under the relevant law. Nihilent has scanned this mail with current virus checking technologies. However, Nihilent makes no representations or warranties to the effect that this communication is virus-free. Nihilent reserves the right to monitor all E-mail communications through its Corporate Network. *** *- -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git patches] net driver updates #2
From: David Miller <[EMAIL PROTECTED]>
Date: Fri, 01 Feb 2008 21:52:10 -0800 (PST)
> From: Jeff Garzik <[EMAIL PROTECTED]>
> Date: Fri, 1 Feb 2008 16:03:38 -0500
>
> > Please pull from 'upstream2-davem' branch of
>
> This is now pulled and pushed back out to net-2.6
The first S2io patch breaks the build so I'm removing it from the
net-2.6 tree. I suspect you rejected an earlier patch that added the
tx_lock member to the S2IO device private.
If you do that Jeff, please at least do a quick sanity check of the
build.
If, instead, I messed things up somehow, my apologies in advance.
drivers/net/s2io.c: In function 's2io_vlan_rx_kill_vid':
drivers/net/s2io.c:395: error: 'struct s2io_nic' has no member named 'tx_lock'
drivers/net/s2io.c:399: error: 'struct s2io_nic' has no member named 'tx_lock'
S2io: Support for vlan_rx_kill_vid entry point
- Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan.
- Fix to aggregate vlan packets. IP offset is incremented by
4 bytes if the packet contains vlan header.
Signed-off-by: Surjit Reang <[EMAIL PROTECTED]>
Signed-off-by: Ramkrishna Vepa <[EMAIL PROTECTED]>
Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
drivers/net/s2io.c | 108 +---
drivers/net/s2io.h |7 ++-
2 files changed, 65 insertions(+), 50 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5fab7d7..dcad502 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -386,6 +386,19 @@ static void s2io_vlan_rx_register(struct net_device *dev,
/* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
static int vlan_strip_flag;
+/* Unregister the vlan */
+static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
+{
+ unsigned long flags;
+ struct s2io_nic *nic = dev->priv;
+
+ spin_lock_irqsave(>tx_lock, flags);
+ if (nic->vlgrp)
+ vlan_group_set_device(nic->vlgrp, vid, NULL);
+
+ spin_unlock_irqrestore(>tx_lock, flags);
+}
+
/*
* Constants to be programmed into the Xena's registers, to configure
* the XAUI.
@@ -2948,7 +2961,7 @@ static void rx_intr_handler(struct ring_info *ring_data)
struct lro *lro = >lro0_n[i];
if (lro->in_use) {
update_L3L4_header(nic, lro);
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent, lro->vlan_tag);
clear_lro_session(lro);
}
}
@@ -7371,7 +7384,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
{
lro_append_pkt(sp, lro,
skb, tcp_len);
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent,
+ lro->vlan_tag);
clear_lro_session(lro);
sp->mac_control.stats_info->
sw_stat.flush_max_pkts++;
@@ -7382,7 +7396,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
lro->frags_len;
sp->mac_control.stats_info->
sw_stat.sending_both++;
- queue_rx_frame(lro->parent);
+ queue_rx_frame(lro->parent,
+ lro->vlan_tag);
clear_lro_session(lro);
goto send_up;
case 0: /* sessions exceeded */
@@ -7408,31 +7423,12 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
*/
skb->ip_summed = CHECKSUM_NONE;
}
- } else {
+ } else
skb->ip_summed = CHECKSUM_NONE;
- }
+
sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
- if (!sp->lro) {
- skb->protocol = eth_type_trans(skb, dev);
- if ((sp->vlgrp && RXD_GET_VLAN_TAG(rxdp->Control_2) &&
- vlan_strip_flag)) {
- /* Queueing the vlan frame to the upper layer */
- if (napi)
- vlan_hwaccel_receive_skb(skb, sp->vlgrp,
- RXD_GET_VLAN_TAG(rxdp->Control_2));
- else
-
Re: [git patches] net driver updates #2
From: David Miller [EMAIL PROTECTED]
Date: Fri, 01 Feb 2008 21:52:10 -0800 (PST)
From: Jeff Garzik [EMAIL PROTECTED]
Date: Fri, 1 Feb 2008 16:03:38 -0500
Please pull from 'upstream2-davem' branch of
This is now pulled and pushed back out to net-2.6
The first S2io patch breaks the build so I'm removing it from the
net-2.6 tree. I suspect you rejected an earlier patch that added the
tx_lock member to the S2IO device private.
If you do that Jeff, please at least do a quick sanity check of the
build.
If, instead, I messed things up somehow, my apologies in advance.
drivers/net/s2io.c: In function 's2io_vlan_rx_kill_vid':
drivers/net/s2io.c:395: error: 'struct s2io_nic' has no member named 'tx_lock'
drivers/net/s2io.c:399: error: 'struct s2io_nic' has no member named 'tx_lock'
S2io: Support for vlan_rx_kill_vid entry point
- Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan.
- Fix to aggregate vlan packets. IP offset is incremented by
4 bytes if the packet contains vlan header.
Signed-off-by: Surjit Reang [EMAIL PROTECTED]
Signed-off-by: Ramkrishna Vepa [EMAIL PROTECTED]
Signed-off-by: Jeff Garzik [EMAIL PROTECTED]
---
drivers/net/s2io.c | 108 +---
drivers/net/s2io.h |7 ++-
2 files changed, 65 insertions(+), 50 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5fab7d7..dcad502 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -386,6 +386,19 @@ static void s2io_vlan_rx_register(struct net_device *dev,
/* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
static int vlan_strip_flag;
+/* Unregister the vlan */
+static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
+{
+ unsigned long flags;
+ struct s2io_nic *nic = dev-priv;
+
+ spin_lock_irqsave(nic-tx_lock, flags);
+ if (nic-vlgrp)
+ vlan_group_set_device(nic-vlgrp, vid, NULL);
+
+ spin_unlock_irqrestore(nic-tx_lock, flags);
+}
+
/*
* Constants to be programmed into the Xena's registers, to configure
* the XAUI.
@@ -2948,7 +2961,7 @@ static void rx_intr_handler(struct ring_info *ring_data)
struct lro *lro = nic-lro0_n[i];
if (lro-in_use) {
update_L3L4_header(nic, lro);
- queue_rx_frame(lro-parent);
+ queue_rx_frame(lro-parent, lro-vlan_tag);
clear_lro_session(lro);
}
}
@@ -7371,7 +7384,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
{
lro_append_pkt(sp, lro,
skb, tcp_len);
- queue_rx_frame(lro-parent);
+ queue_rx_frame(lro-parent,
+ lro-vlan_tag);
clear_lro_session(lro);
sp-mac_control.stats_info-
sw_stat.flush_max_pkts++;
@@ -7382,7 +7396,8 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
lro-frags_len;
sp-mac_control.stats_info-
sw_stat.sending_both++;
- queue_rx_frame(lro-parent);
+ queue_rx_frame(lro-parent,
+ lro-vlan_tag);
clear_lro_session(lro);
goto send_up;
case 0: /* sessions exceeded */
@@ -7408,31 +7423,12 @@ static int rx_osm_handler(struct ring_info *ring_data,
struct RxD_t * rxdp)
*/
skb-ip_summed = CHECKSUM_NONE;
}
- } else {
+ } else
skb-ip_summed = CHECKSUM_NONE;
- }
+
sp-mac_control.stats_info-sw_stat.mem_freed += skb-truesize;
- if (!sp-lro) {
- skb-protocol = eth_type_trans(skb, dev);
- if ((sp-vlgrp RXD_GET_VLAN_TAG(rxdp-Control_2)
- vlan_strip_flag)) {
- /* Queueing the vlan frame to the upper layer */
- if (napi)
- vlan_hwaccel_receive_skb(skb, sp-vlgrp,
- RXD_GET_VLAN_TAG(rxdp-Control_2));
- else
- vlan_hwaccel_rx(skb, sp-vlgrp,
-
Re: [git patches] net driver updates #2
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 1 Feb 2008 16:03:38 -0500 > Please pull from 'upstream2-davem' branch of This is now pulled and pushed back out to net-2.6 Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git patches] net driver updates #2
From: Jeff Garzik <[EMAIL PROTECTED]> Date: Fri, 1 Feb 2008 16:03:38 -0500 > This submit is based on top of Linus's tree, since I'm not sure what's > going on with net-2.6.git and my previous (lost?) submission. > > These changes do /not/ include anything from the previous submission, > which was on top of net-2.6 -- but then you rebased, which probably made > everything more difficult. :) Can you respin the tree with that previus submission init? The best I'll be able to do is clone that entire tree in order to pick the patches out, and from here in Australia with a dodgy link I might not even finish before I have to get on a plane back home on Monday :-) I'll pull in this second set later tonight. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git patches] net driver updates #2
From: Jeff Garzik [EMAIL PROTECTED] Date: Fri, 1 Feb 2008 16:03:38 -0500 This submit is based on top of Linus's tree, since I'm not sure what's going on with net-2.6.git and my previous (lost?) submission. These changes do /not/ include anything from the previous submission, which was on top of net-2.6 -- but then you rebased, which probably made everything more difficult. :) Can you respin the tree with that previus submission init? The best I'll be able to do is clone that entire tree in order to pick the patches out, and from here in Australia with a dodgy link I might not even finish before I have to get on a plane back home on Monday :-) I'll pull in this second set later tonight. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [git patches] net driver updates #2
From: Jeff Garzik [EMAIL PROTECTED] Date: Fri, 1 Feb 2008 16:03:38 -0500 Please pull from 'upstream2-davem' branch of This is now pulled and pushed back out to net-2.6 Thanks! -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
