diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-30 11:20:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-30 11:20:55 -0700 |
| commit | 2dbed9cb773c995cbfff0f567a2d6847fda12ba3 (patch) | |
| tree | 14ec7310894c4119fe2225859642ccc30eb155f3 /include | |
| parent | 7570df54ef8cc5b42500d26562ff50fcbe265aa2 (diff) | |
| parent | 40603c8be4ba54146965a4dc42bbccbcf3efd4b1 (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/llc_conn.h | 1 | ||||
| -rw-r--r-- | include/net/llc_mac.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h index b27ee7332c3b..3dd6d0b19f6b 100644 --- a/include/net/llc_conn.h +++ b/include/net/llc_conn.h @@ -79,7 +79,6 @@ extern int llc_sk_init(struct sock *sk); extern int llc_conn_state_process(struct sock *sk, struct sk_buff *skb); extern void llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb); extern void llc_conn_rtn_pdu(struct sock *sk, struct sk_buff *skb); -extern void llc_conn_free_ev(struct sk_buff *skb); extern void llc_conn_resend_i_pdu_as_cmd(struct sock *sk, u8 nr, u8 first_p_bit); extern void llc_conn_resend_i_pdu_as_rsp(struct sock *sk, u8 nr, diff --git a/include/net/llc_mac.h b/include/net/llc_mac.h index e87850701db6..ded7c830b8a8 100644 --- a/include/net/llc_mac.h +++ b/include/net/llc_mac.h @@ -13,8 +13,6 @@ */ extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt); -extern struct net_device *mac_dev_peer(struct net_device *current_dev, - int type, u8 *mac); extern u16 lan_hdrs_init(struct sk_buff *skb, u8 *sa, u8 *da); extern int llc_conn_rcv(struct sock *sk, struct sk_buff *skb); |