Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 256303
b: refs/heads/master
c: e3001c9
h: refs/heads/master
i:
  256301: 179cecf
  256299: 4071dbe
  256295: 6c19adc
  256287: 0858330
v: v3
  • Loading branch information
Andre Heider authored and David S. Miller committed Jul 14, 2011
1 parent c56d6ae commit 5d0e136
Show file tree
Hide file tree
Showing 2 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: 40522998dec20d970fe6f0ea8507004aef18f72d
refs/heads/master: e3001c98df51d81a72534837d8069bfb53f3e1ea
6 changes: 3 additions & 3 deletions trunk/drivers/net/ps3_gelic_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev)
result = gelic_descr_prepare_tx(card, descr, skb);
if (result) {
/*
* DMA map failed. As chanses are that failure
* DMA map failed. As chances are that failure
* would continue, just release skb and return
*/
netdev->stats.tx_dropped++;
Expand Down Expand Up @@ -1041,7 +1041,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
goto refill;
}
/*
* descriptoers any other than FRAME_END here should
* descriptors any other than FRAME_END here should
* be treated as error.
*/
if (status != GELIC_DESCR_DMA_FRAME_END) {
Expand Down Expand Up @@ -1200,7 +1200,7 @@ void gelic_net_poll_controller(struct net_device *netdev)
#endif /* CONFIG_NET_POLL_CONTROLLER */

/**
* gelic_net_open - called upon ifonfig up
* gelic_net_open - called upon ifconfig up
* @netdev: interface device structure
*
* returns 0 on success, <0 on failure
Expand Down

0 comments on commit 5d0e136

Please sign in to comment.