diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/dm9000.h | 2 | ||||
-rw-r--r-- | include/linux/netdevice.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h index 0008e2ad0c9f..a3750462f9e3 100644 --- a/include/linux/dm9000.h +++ b/include/linux/dm9000.h | |||
@@ -19,6 +19,8 @@ | |||
19 | #define DM9000_PLATF_8BITONLY (0x0001) | 19 | #define DM9000_PLATF_8BITONLY (0x0001) |
20 | #define DM9000_PLATF_16BITONLY (0x0002) | 20 | #define DM9000_PLATF_16BITONLY (0x0002) |
21 | #define DM9000_PLATF_32BITONLY (0x0004) | 21 | #define DM9000_PLATF_32BITONLY (0x0004) |
22 | #define DM9000_PLATF_EXT_PHY (0x0008) | ||
23 | #define DM9000_PLATF_NO_EEPROM (0x0010) | ||
22 | 24 | ||
23 | /* platfrom data for platfrom device structure's platfrom_data field */ | 25 | /* platfrom data for platfrom device structure's platfrom_data field */ |
24 | 26 | ||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7128a02f1d37..a2f003239c85 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -604,6 +604,10 @@ struct net_device | |||
604 | 604 | ||
605 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ | 605 | unsigned char broadcast[MAX_ADDR_LEN]; /* hw bcast add */ |
606 | 606 | ||
607 | /* ingress path synchronizer */ | ||
608 | spinlock_t ingress_lock; | ||
609 | struct Qdisc *qdisc_ingress; | ||
610 | |||
607 | /* | 611 | /* |
608 | * Cache line mostly used on queue transmit path (qdisc) | 612 | * Cache line mostly used on queue transmit path (qdisc) |
609 | */ | 613 | */ |
@@ -617,10 +621,6 @@ struct net_device | |||
617 | /* Partially transmitted GSO packet. */ | 621 | /* Partially transmitted GSO packet. */ |
618 | struct sk_buff *gso_skb; | 622 | struct sk_buff *gso_skb; |
619 | 623 | ||
620 | /* ingress path synchronizer */ | ||
621 | spinlock_t ingress_lock; | ||
622 | struct Qdisc *qdisc_ingress; | ||
623 | |||
624 | /* | 624 | /* |
625 | * One part is mostly used on xmit path (device) | 625 | * One part is mostly used on xmit path (device) |
626 | */ | 626 | */ |