diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:19:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:19:42 -0400 |
| commit | e47f31787dee5bf57453e18edefff56e17fa44f9 (patch) | |
| tree | 6c86b53192526bf9b7f6581720dbd12dc085aff5 /include | |
| parent | a0486407bea3f0545ee3fcfb768b6763c5c2b459 (diff) | |
| parent | a6f157a88d1398d7ccb743c5a56138edf6f6ef0b (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[NET]: fix __sk_stream_mem_reclaim
[Bluetooth] Fix deadlock in the L2CAP layer
[Bluetooth] Let BT_HIDP depend on INPUT
[Bluetooth] Avoid NULL pointer dereference with tty->driver
[Bluetooth] Remaining transitions to use kzalloc()
[WAN]: converting generic HDLC to use netif_dormant*()
[IPV4]: Fix error handling for fib_insert_node call
[NETROM] lockdep: fix false positive
[ROSE] lockdep: fix false positive
[AX.25]: Optimize AX.25 socket list lock
[IPCOMP]: Fix truesize after decompression
[IPV6]: Use ipv6_addr_src_scope for link address sorting.
[TCP] tcp_highspeed: Fix AI updates.
[MAINTAINERS]: Add proper entry for TC classifier
[NETROM]: Drop lock before calling nr_destroy_socket
[NETROM]: Fix locking order when establishing a NETROM circuit.
[AX.25]: Fix locking of ax25 protocol function list.
[IPV6]: order addresses by scope
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hdlc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index 4513f9e40937..d5ebbb29aeae 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h | |||
| @@ -224,8 +224,6 @@ static __inline__ void debug_frame(const struct sk_buff *skb) | |||
| 224 | int hdlc_open(struct net_device *dev); | 224 | int hdlc_open(struct net_device *dev); |
| 225 | /* Must be called by hardware driver when HDLC device is being closed */ | 225 | /* Must be called by hardware driver when HDLC device is being closed */ |
| 226 | void hdlc_close(struct net_device *dev); | 226 | void hdlc_close(struct net_device *dev); |
| 227 | /* Called by hardware driver when DCD line level changes */ | ||
| 228 | void hdlc_set_carrier(int on, struct net_device *dev); | ||
| 229 | 227 | ||
| 230 | /* May be used by hardware driver to gain control over HDLC device */ | 228 | /* May be used by hardware driver to gain control over HDLC device */ |
| 231 | static __inline__ void hdlc_proto_detach(hdlc_device *hdlc) | 229 | static __inline__ void hdlc_proto_detach(hdlc_device *hdlc) |