Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121687
b: refs/heads/master
c: 539afed
h: refs/heads/master
i:
  121685: a2c8b5e
  121683: d731a50
  121679: 47241bb
v: v3
  • Loading branch information
Jianjun Kong authored and David S. Miller committed Nov 3, 2008
1 parent 2cb0d28 commit 92ee76a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: f4cca7ffb2700bff5752fbbc28f49d58ed2c5cb3
refs/heads/master: 539afedfccb39577c9264b29f11ec9556fd45022
10 changes: 5 additions & 5 deletions trunk/net/ipv4/devinet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event,
}

static struct notifier_block ip_netdev_notifier = {
.notifier_call =inetdev_event,
.notifier_call = inetdev_event,
};

static inline size_t inet_nlmsg_size(void)
Expand Down Expand Up @@ -1188,7 +1188,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len;
}

static void rtmsg_ifa(int event, struct in_ifaddr* ifa, struct nlmsghdr *nlh,
static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,
u32 pid)
{
struct sk_buff *skb;
Expand Down Expand Up @@ -1255,7 +1255,7 @@ static void inet_forward_change(struct net *net)
}

static int devinet_conf_proc(ctl_table *ctl, int write,
struct file* filp, void __user *buffer,
struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos)
{
int ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
Expand Down Expand Up @@ -1327,7 +1327,7 @@ static int devinet_conf_sysctl(ctl_table *table,
}

static int devinet_sysctl_forward(ctl_table *ctl, int write,
struct file* filp, void __user *buffer,
struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos)
{
int *valp = ctl->data;
Expand Down Expand Up @@ -1356,7 +1356,7 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
}

int ipv4_doint_and_flush(ctl_table *ctl, int write,
struct file* filp, void __user *buffer,
struct file *filp, void __user *buffer,
size_t *lenp, loff_t *ppos)
{
int *valp = ctl->data;
Expand Down

0 comments on commit 92ee76a

Please sign in to comment.