Commit 88f3b6af authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 2f746ed2 abe5d153
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#ifndef KERNEL_IRDA_H #ifndef KERNEL_IRDA_H
#define KERNEL_IRDA_H #define KERNEL_IRDA_H
#include <linux/socket.h> /* only for sa_family_t */
/* Hint bit positions for first hint byte */ /* Hint bit positions for first hint byte */
#define HINT_PNP 0x01 #define HINT_PNP 0x01
#define HINT_PDA 0x02 #define HINT_PDA 0x02
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#define _LINUX_NET_H #define _LINUX_NET_H
#include <linux/config.h> #include <linux/config.h>
#include <linux/socket.h>
#include <linux/wait.h> #include <linux/wait.h>
struct poll_table_struct; struct poll_table_struct;
...@@ -88,6 +87,8 @@ struct socket { ...@@ -88,6 +87,8 @@ struct socket {
struct vm_area_struct; struct vm_area_struct;
struct page; struct page;
struct kiocb; struct kiocb;
struct sockaddr;
struct msghdr;
struct proto_ops { struct proto_ops {
int family; int family;
...@@ -136,6 +137,8 @@ struct net_proto_family { ...@@ -136,6 +137,8 @@ struct net_proto_family {
short encrypt_net; short encrypt_net;
}; };
struct iovec;
extern int sock_wake_async(struct socket *sk, int how, int band); extern int sock_wake_async(struct socket *sk, int how, int band);
extern int sock_register(struct net_proto_family *fam); extern int sock_register(struct net_proto_family *fam);
extern int sock_unregister(int family); extern int sock_unregister(int family);
......
#ifndef __LINUX_NETLINK_H #ifndef __LINUX_NETLINK_H
#define __LINUX_NETLINK_H #define __LINUX_NETLINK_H
#include <linux/socket.h> /* for sa_family_t */
#define NETLINK_ROUTE 0 /* Routing/device hook */ #define NETLINK_ROUTE 0 /* Routing/device hook */
#define NETLINK_SKIP 1 /* Reserved for ENskip */ #define NETLINK_SKIP 1 /* Reserved for ENskip */
#define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */ #define NETLINK_USERSOCK 2 /* Reserved for user mode socket protocols */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment