diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-13 01:41:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-13 01:41:06 -0700 |
| commit | ed54ae2e3d2cabd389e9daf52536ac2939706aa2 (patch) | |
| tree | d414c27bc1e1a92ab8cfca6145fd6cce4e9ec7b8 /include/linux | |
| parent | c39f732042a43ded87dbe10efa3a2e0990e0f3d9 (diff) | |
| parent | 96b2cae773183e8298385cf05103b3abeb3cfa7e (diff) | |
Merge master.kernel.org:/home/acme/BK/llc-2.5
into nuts.ninka.net:/home/davem/src/BK/llc-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/llc.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/llc.h b/include/linux/llc.h index 824a149e9e6b..77ac5d9df544 100644 --- a/include/linux/llc.h +++ b/include/linux/llc.h @@ -78,17 +78,6 @@ enum llc_sockopts { #define LLC_SAP_DYN_STOP 0xDE #define LLC_SAP_DYN_TRIES 4 -struct sock; - -struct llc_ui_opt { - u16 link; /* network layer link number */ - struct llc_sap *sap; /* pointer to parent SAP */ - struct sock *core_sk; - struct net_device *dev; /* device to send to remote */ - struct sockaddr_llc addr; /* address sock is bound to */ -}; - -#define llc_ui_sk(__sk) ((struct llc_ui_opt *)(__sk)->protinfo) #define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0])) #ifdef CONFIG_LLC_UI |