Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 73431
b: refs/heads/master
c: ab5adec
h: refs/heads/master
i:
  73429: 6fa03d1
  73427: 879351b
  73423: d47c73f
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Nov 10, 2007
1 parent a7d906e commit e97e395
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac93a3946b676025fa55356180e8321639744b31
refs/heads/master: ab5adecb2d02f3688719dfb5936a82833fcc3955
12 changes: 9 additions & 3 deletions trunk/drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -2247,20 +2247,26 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
do {
struct sky2_port *sky2;
struct sky2_status_le *le = hw->st_le + hw->st_idx;
unsigned port = le->css & CSS_LINK_BIT;
unsigned port;
struct net_device *dev;
struct sk_buff *skb;
u32 status;
u16 length;
u8 opcode = le->opcode;

if (!(opcode & HW_OWNER))
break;

hw->st_idx = RING_NEXT(hw->st_idx, STATUS_RING_SIZE);

port = le->css & CSS_LINK_BIT;
dev = hw->dev[port];
sky2 = netdev_priv(dev);
length = le16_to_cpu(le->length);
status = le32_to_cpu(le->status);

switch (le->opcode & ~HW_OWNER) {
le->opcode = 0;
switch (opcode & ~HW_OWNER) {
case OP_RXSTAT:
++rx[port];
skb = sky2_receive(dev, length, status);
Expand Down Expand Up @@ -2353,7 +2359,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do, u16 idx)
default:
if (net_ratelimit())
printk(KERN_WARNING PFX
"unknown status opcode 0x%x\n", le->opcode);
"unknown status opcode 0x%x\n", opcode);
}
} while (hw->st_idx != idx);

Expand Down

0 comments on commit e97e395

Please sign in to comment.