Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62806
b: refs/heads/master
c: ea6992a
h: refs/heads/master
v: v3
  • Loading branch information
Masakazu Mokuno authored and Jeff Garzik committed Jul 24, 2007
1 parent 9d118dc commit 0592638
Show file tree
Hide file tree
Showing 3 changed files with 4 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: 9f6c9a8c50bc84ec748fec779ead321ee2b2debc
refs/heads/master: ea6992aa1f6ed514fe450f46befa56d8d2b6a7fb
5 changes: 3 additions & 2 deletions trunk/drivers/net/ps3_gelic_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ static void gelic_net_release_rx_chain(struct gelic_net_card *card)
descr->buf_addr = 0;
dev_kfree_skb_any(descr->skb);
descr->skb = NULL;
descr->dmac_cmd_status = GELIC_NET_DESCR_NOT_IN_USE;
gelic_net_set_descr_status(descr,
GELIC_NET_DESCR_NOT_IN_USE);
}
descr = descr->next;
} while (descr != card->rx_chain.head);
Expand Down Expand Up @@ -374,7 +375,7 @@ static void gelic_net_release_tx_descr(struct gelic_net_card *card,
descr->skb = NULL;

/* set descr status */
descr->dmac_cmd_status = GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE;
gelic_net_set_descr_status(descr, GELIC_NET_DESCR_NOT_IN_USE);
}

/**
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/net/ps3_gelic_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ enum gelic_net_int1_status {
* interrupt status */

#define GELIC_NET_DMAC_CMDSTAT_CHAIN_END 0x00000002 /* RXDCEIS:DMA stopped */
#define GELIC_NET_DMAC_CMDSTAT_NOT_IN_USE 0xb0000000
#define GELIC_NET_DESCR_IND_PROC_SHIFT 28
#define GELIC_NET_DESCR_IND_PROC_MASKO 0x0fffffff

Expand Down

0 comments on commit 0592638

Please sign in to comment.