git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: allow configure_filter callback to sleep
[safe/jmp/linux-2.6]
/
drivers
/
net
/
atl1c
/
atl1c.h
diff --git
a/drivers/net/atl1c/atl1c.h
b/drivers/net/atl1c/atl1c.h
index
ac11b84
..
2a1120a
100644
(file)
--- a/
drivers/net/atl1c/atl1c.h
+++ b/
drivers/net/atl1c/atl1c.h
@@
-45,7
+45,6
@@
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
#include <linux/tcp.h>
#include <linux/vmalloc.h>
#include <linux/pagemap.h>
#include <linux/tcp.h>
-#include <linux/mii.h>
#include <linux/ethtool.h>
#include <linux/if_vlan.h>
#include <linux/workqueue.h>
#include <linux/ethtool.h>
#include <linux/if_vlan.h>
#include <linux/workqueue.h>
@@
-189,14
+188,14
@@
struct atl1c_tpd_ext_desc {
#define RRS_HDS_TYPE_DATA 2
#define RRS_IS_NO_HDS_TYPE(flag) \
#define RRS_HDS_TYPE_DATA 2
#define RRS_IS_NO_HDS_TYPE(flag) \
- (((
flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK
== 0)
+ (((
(flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK)
== 0)
#define RRS_IS_HDS_HEAD(flag) \
#define RRS_IS_HDS_HEAD(flag) \
- (((
flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK
== \
+ (((
(flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK)
== \
RRS_HDS_TYPE_HEAD)
#define RRS_IS_HDS_DATA(flag) \
RRS_HDS_TYPE_HEAD)
#define RRS_IS_HDS_DATA(flag) \
- (((
flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK
== \
+ (((
(flag) >> (RRS_HDS_TYPE_SHIFT)) & RRS_HDS_TYPE_MASK)
== \
RRS_HDS_TYPE_DATA)
/* rrs word 3 bit 0:31 */
RRS_HDS_TYPE_DATA)
/* rrs word 3 bit 0:31 */
@@
-246,7
+245,7
@@
struct atl1c_tpd_ext_desc {
#define RRS_PACKET_TYPE_802_3 1
#define RRS_PACKET_TYPE_ETH 0
#define RRS_PACKET_IS_ETH(word) \
#define RRS_PACKET_TYPE_802_3 1
#define RRS_PACKET_TYPE_ETH 0
#define RRS_PACKET_IS_ETH(word) \
- (((
word) >> RRS_PACKET_TYPE_SHIFT) & RRS_PACKET_TYPE_MASK
== \
+ (((
(word) >> RRS_PACKET_TYPE_SHIFT) & RRS_PACKET_TYPE_MASK)
== \
RRS_PACKET_TYPE_ETH)
#define RRS_RXD_IS_VALID(word) \
((((word) >> RRS_RXD_UPDATED_SHIFT) & RRS_RXD_UPDATED_MASK) == 1)
RRS_PACKET_TYPE_ETH)
#define RRS_RXD_IS_VALID(word) \
((((word) >> RRS_RXD_UPDATED_SHIFT) & RRS_RXD_UPDATED_MASK) == 1)