Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109163
b: refs/heads/master
c: 5770a3f
h: refs/heads/master
i:
  109161: 33aabcd
  109159: 5e30595
v: v3
  • Loading branch information
David Woodhouse authored and Linus Torvalds committed Aug 26, 2008
1 parent 30ce428 commit 142f605
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b22dfb735a019a721117e713968c1ddf60ee6142
refs/heads/master: 5770a3fb5f8544d40ae03b010318345cdd05d662
14 changes: 7 additions & 7 deletions trunk/include/linux/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,9 @@
#ifndef _LINUX_NET_H
#define _LINUX_NET_H

#include <linux/wait.h>
#include <linux/socket.h>
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */
#include <asm/socket.h>

struct poll_table_struct;
struct pipe_inode_info;
struct inode;
struct net;

#define NPROTO AF_MAX

#define SYS_SOCKET 1 /* sys_socket(2) */
Expand Down Expand Up @@ -62,6 +55,13 @@ typedef enum {
#ifdef __KERNEL__
#include <linux/stringify.h>
#include <linux/random.h>
#include <linux/wait.h>
#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */

struct poll_table_struct;
struct pipe_inode_info;
struct inode;
struct net;

#define SOCK_ASYNC_NOSPACE 0
#define SOCK_ASYNC_WAITDATA 1
Expand Down

0 comments on commit 142f605

Please sign in to comment.