diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-25 06:37:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-25 06:37:39 -0700 |
| commit | b4e17e9c5b574d3560292b7c907e15a95f3de090 (patch) | |
| tree | d43e2bdfc99a95bdcb3925a8e9241a3c7ed797d0 /include/net | |
| parent | 2aceaa81b628f67812a0f62a50b17b43cc9d19f9 (diff) | |
| parent | c84af5795c7663d7a8ef51615c90f6eb1ccf7b81 (diff) | |
Merge master.kernel.org:/home/acme/BK/llc-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/llc_main.h | 1 | ||||
| -rw-r--r-- | include/net/llc_sap.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/net/llc_main.h b/include/net/llc_main.h index 343f3144fbe1..434e86044dec 100644 --- a/include/net/llc_main.h +++ b/include/net/llc_main.h @@ -63,5 +63,4 @@ extern void llc_station_state_process(struct llc_station *station, extern void llc_station_send_pdu(struct llc_station *station, struct sk_buff *skb); extern struct sk_buff *llc_alloc_frame(void); -extern struct packet_type llc_packet_type; #endif /* LLC_MAIN_H */ diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h index ac49be6fcbee..645e52759b36 100644 --- a/include/net/llc_sap.h +++ b/include/net/llc_sap.h @@ -42,8 +42,7 @@ struct llc_sap { extern void llc_sap_assign_sock(struct llc_sap *sap, struct sock *sk); extern void llc_sap_unassign_sock(struct llc_sap *sap, struct sock *sk); -extern void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb, - struct packet_type *pt); +extern void llc_sap_state_process(struct llc_sap *sap, struct sk_buff *skb); extern void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb); extern void llc_sap_send_pdu(struct llc_sap *sap, struct sk_buff *skb); #endif /* LLC_SAP_H */ |