diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:33:26 -0700 |
| commit | 5c1f4cac6ff75a4a602bae960a054ed3df7e9765 (patch) | |
| tree | 31b0b05a41345e9dbf802a309ddf21eb506e8550 /include/net/llc_sap.h | |
| parent | c6a519d2aac024d8ca5658bddd78af474b274e4b (diff) | |
| parent | 56e9b263242ca80a70abd8831343b268315c27dc (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/llc_sap.h')
| -rw-r--r-- | include/net/llc_sap.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h index 353baaa627f..2c56dbece72 100644 --- a/include/net/llc_sap.h +++ b/include/net/llc_sap.h @@ -12,11 +12,15 @@ * See the GNU General Public License for more details. */ struct llc_sap; +struct net_device; struct sk_buff; +struct sock; extern void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb); -extern void llc_save_primitive(struct sk_buff* skb, unsigned char prim); -extern struct sk_buff *llc_alloc_frame(void); +extern void llc_save_primitive(struct sock *sk, struct sk_buff* skb, + unsigned char prim); +extern struct sk_buff *llc_alloc_frame(struct sock *sk, + struct net_device *dev); extern void llc_build_and_send_test_pkt(struct llc_sap *sap, struct sk_buff *skb, |