diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /include/net/llc.h | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'include/net/llc.h')
| -rw-r--r-- | include/net/llc.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net/llc.h b/include/net/llc.h index c9aed2a8b4e2..71769a5aeef3 100644 --- a/include/net/llc.h +++ b/include/net/llc.h | |||
| @@ -46,7 +46,8 @@ struct llc_sap { | |||
| 46 | unsigned char f_bit; | 46 | unsigned char f_bit; |
| 47 | int (*rcv_func)(struct sk_buff *skb, | 47 | int (*rcv_func)(struct sk_buff *skb, |
| 48 | struct net_device *dev, | 48 | struct net_device *dev, |
| 49 | struct packet_type *pt); | 49 | struct packet_type *pt, |
| 50 | struct net_device *orig_dev); | ||
| 50 | struct llc_addr laddr; | 51 | struct llc_addr laddr; |
| 51 | struct list_head node; | 52 | struct list_head node; |
| 52 | struct { | 53 | struct { |
| @@ -64,7 +65,7 @@ extern rwlock_t llc_sap_list_lock; | |||
| 64 | extern unsigned char llc_station_mac_sa[ETH_ALEN]; | 65 | extern unsigned char llc_station_mac_sa[ETH_ALEN]; |
| 65 | 66 | ||
| 66 | extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, | 67 | extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, |
| 67 | struct packet_type *pt); | 68 | struct packet_type *pt, struct net_device *orig_dev); |
| 68 | 69 | ||
| 69 | extern int llc_mac_hdr_init(struct sk_buff *skb, | 70 | extern int llc_mac_hdr_init(struct sk_buff *skb, |
| 70 | unsigned char *sa, unsigned char *da); | 71 | unsigned char *sa, unsigned char *da); |
| @@ -78,7 +79,8 @@ extern void llc_set_station_handler(void (*handler)(struct sk_buff *skb)); | |||
| 78 | extern struct llc_sap *llc_sap_open(unsigned char lsap, | 79 | extern struct llc_sap *llc_sap_open(unsigned char lsap, |
| 79 | int (*rcv)(struct sk_buff *skb, | 80 | int (*rcv)(struct sk_buff *skb, |
| 80 | struct net_device *dev, | 81 | struct net_device *dev, |
| 81 | struct packet_type *pt)); | 82 | struct packet_type *pt, |
| 83 | struct net_device *orig_dev)); | ||
| 82 | extern void llc_sap_close(struct llc_sap *sap); | 84 | extern void llc_sap_close(struct llc_sap *sap); |
| 83 | 85 | ||
| 84 | extern struct llc_sap *llc_sap_find(unsigned char sap_value); | 86 | extern struct llc_sap *llc_sap_find(unsigned char sap_value); |