[ewg] Re: [PATCH] RDMA/nes: MAC interrupt erroneously masked on ifdown

[Roland Dreier]

thanks, applied.  one minor request:

  Signed-off-by: Chien Tung [EMAIL PROTECTED]
  Signed-off-by: Glenn Streiff [EMAIL PROTECTED]

I'm assuming the first signoff line is coming from the actual author
here.  If so, for patches like this please include a line like

From: Chien Tung [EMAIL PROTECTED]

before the changelog.  That will make the patch import tools set the
Author: line for the patch correctly.  As it stands, when I import
this patch into git, the Author: ends up as Glenn Streiff, which is
not a big problem but it's always nice to get it really correct.

 - R.
___
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg

[ewg] RDMA/nes: Fix vlan support

[gstreiff]

From: Chien Tung [EMAIL PROTECTED]

Needed to account for vlan header size in nes_netdev_change_mtu()
and nes_netdev_init().  Also, adding spin lock/unlock during
vlan rx registration so only one process can assign vlan group
for a given interface at a time.

Signed-off-by: Chien Tung [EMAIL PROTECTED]
Signed-off-by: Glenn Streiff [EMAIL PROTECTED]

---
 drivers/infiniband/hw/nes/nes_nic.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_nic.c 
b/drivers/infiniband/hw/nes/nes_nic.c
index 67827ad..bf9f71c 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -932,7 +932,7 @@ static int nes_netdev_change_mtu(struct net_device 
*netdev, int new_mtu)
return -EINVAL;
 
netdev-mtu = new_mtu;
-   nesvnic-max_frame_size = new_mtu+ETH_HLEN;
+   nesvnic-max_frame_size = new_mtu + VLAN_ETH_HLEN;
 
if (netdev-mtu  1500) {
jumbomode=1;
@@ -1494,10 +1494,15 @@ static void nes_netdev_vlan_rx_register(struct 
net_device *netdev, struct vlan_g
 {
struct nes_vnic *nesvnic = netdev_priv(netdev);
struct nes_device *nesdev = nesvnic-nesdev;
+   struct nes_adapter *nesadapter = nesdev-nesadapter;
u32 u32temp;
+   unsigned long flags;
 
+   spin_lock_irqsave(nesadapter-phy_lock, flags);
nesvnic-vlan_grp = grp;
 
+   nes_debug(NES_DBG_NETDEV, %s: %s\n, __FUNCTION__, netdev-name);
+
/* Enable/Disable VLAN Stripping */
u32temp = nes_read_indexed(nesdev, NES_IDX_PCIX_DIAG);
if (grp)
@@ -1506,6 +1511,7 @@ static void nes_netdev_vlan_rx_register(struct net_device 
*netdev, struct vlan_g
u32temp |= 0x0200;
 
nes_write_indexed(nesdev, NES_IDX_PCIX_DIAG, u32temp);
+   spin_unlock_irqrestore(nesadapter-phy_lock, flags);
 }
 
 
@@ -1564,7 +1570,7 @@ struct net_device *nes_netdev_init(struct nes_device 
*nesdev,
nesvnic-msg_enable = netif_msg_init(debug, default_msg);
nesvnic-netdev_index = nesdev-netdev_count;
nesvnic-perfect_filter_index = nesdev-nesadapter-netdev_count;
-   nesvnic-max_frame_size = netdev-mtu+netdev-hard_header_len;
+   nesvnic-max_frame_size = netdev-mtu + netdev-hard_header_len + 
VLAN_HLEN;
 
curr_qp_map = 
nic_qp_mapping_per_function[PCI_FUNC(nesdev-pcidev-devfn)];
nesvnic-nic.qp_id = curr_qp_map[nesdev-netdev_count].qpid;
___
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg

[ewg] Let's chat

[Henry Alfaro]

Hello! I am bored this evening. I am nice girl that would like to chat with 
you. Email me at [EMAIL PROTECTED] only, because I am using my friend's email 
to write this. Mind me sending some of my pictures to you?
___
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg