diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 1 | ||||
| -rw-r--r-- | include/linux/if_arp.h | 2 | ||||
| -rw-r--r-- | include/linux/netlink.h | 2 | ||||
| -rw-r--r-- | include/linux/parport.h | 1 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index f6866ccf6abb..6f6ef817b059 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1058,6 +1058,7 @@ extern int fs_may_remount_ro(struct super_block *); extern int try_to_free_buffers(struct page *, unsigned int); extern void refile_buffer(struct buffer_head * buf); +extern void end_buffer_io_sync(struct buffer_head *bh, int uptodate); /* reiserfs_writepage needs this */ extern void set_buffer_async_io(struct buffer_head *bh) ; diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 9843b91077d2..e8dc980b0ea0 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -35,10 +35,10 @@ #define ARPHRD_IEEE802 6 /* IEEE 802.2 Ethernet/TR/TB */ #define ARPHRD_ARCNET 7 /* ARCnet */ #define ARPHRD_APPLETLK 8 /* APPLEtalk */ -#define ARPHRD_IEEE1394 9 /* IEEE 1394 IPv4 - RFC 2734 */ #define ARPHRD_DLCI 15 /* Frame Relay DLCI */ #define ARPHRD_ATM 19 /* ATM */ #define ARPHRD_METRICOM 23 /* Metricom STRIP (new IANA id) */ +#define ARPHRD_IEEE1394 24 /* IEEE 1394 IPv4 - RFC 2734 */ /* Dummy types for non ARP hardware */ #define ARPHRD_SLIP 256 diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 2afb52e98531..ce7f93b9e9d0 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -34,7 +34,7 @@ struct nlmsghdr #define NLM_F_REQUEST 1 /* It is request message. */ #define NLM_F_MULTI 2 /* Multipart message, terminated by NLMSG_DONE */ -#define NLM_F_ACK 4 /* If succeed, reply with ack */ +#define NLM_F_ACK 4 /* Reply with ack, with zero or error code */ #define NLM_F_ECHO 8 /* Echo this request */ /* Modifiers to GET request */ diff --git a/include/linux/parport.h b/include/linux/parport.h index 40732e005e85..8d148b6db6e9 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -22,6 +22,7 @@ #define PARPORT_DMA_NOFIFO -3 #define PARPORT_DISABLE -2 #define PARPORT_IRQ_PROBEONLY -3 +#define PARPORT_IOHI_AUTO -1 #define PARPORT_CONTROL_STROBE 0x1 #define PARPORT_CONTROL_AUTOFD 0x2 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 44fc5e05e267..09eee390b5bc 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1124,6 +1124,7 @@ extern void skb_free_datagram(struct sock * sk, struct sk_buff *skb); extern unsigned int skb_checksum(const struct sk_buff *skb, int offset, int len, unsigned int csum); extern int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); extern unsigned int skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *to, int len, unsigned int csum); +extern void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to); extern void skb_init(void); extern void skb_add_mtu(int mtu); |