diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 05:30:02 -0400 |
| commit | d9e34325fd62310b7b49243d02b774f3ef2452db (patch) | |
| tree | d356eab72377f2576ad356de66daec23f28529a5 /drivers/net/sungem.h | |
| parent | 500f83abdc83d6bd472f3d103a9a9cd85df29a29 (diff) | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/sungem.h')
| -rw-r--r-- | drivers/net/sungem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index ff8ae5f79970..16edbb1a4a7a 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h | |||
| @@ -1035,7 +1035,8 @@ struct gem { | |||
| 1035 | 1035 | ||
| 1036 | #define ALIGNED_RX_SKB_ADDR(addr) \ | 1036 | #define ALIGNED_RX_SKB_ADDR(addr) \ |
| 1037 | ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) | 1037 | ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) |
| 1038 | static __inline__ struct sk_buff *gem_alloc_skb(int size, int gfp_flags) | 1038 | static __inline__ struct sk_buff *gem_alloc_skb(int size, |
| 1039 | unsigned int __nocast gfp_flags) | ||
| 1039 | { | 1040 | { |
| 1040 | struct sk_buff *skb = alloc_skb(size + 64, gfp_flags); | 1041 | struct sk_buff *skb = alloc_skb(size + 64, gfp_flags); |
| 1041 | 1042 | ||