Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 69413
b: refs/heads/master
c: 861d048
h: refs/heads/master
i:
  69411: d703e1a
v: v3
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Oct 15, 2007
1 parent 6afcb89 commit 650164e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 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: a030847e9f0eed2a080f6114381c649a7aa43d25
refs/heads/master: 861d04860725dc85944bf9fa815af338d9e56b43
2 changes: 1 addition & 1 deletion trunk/net/ipv4/ip_forward.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <net/route.h>
#include <net/xfrm.h>

static inline int ip_forward_finish(struct sk_buff *skb)
static int ip_forward_finish(struct sk_buff *skb)
{
struct ip_options * opt = &(IPCB(skb)->opt);

Expand Down
4 changes: 2 additions & 2 deletions trunk/net/ipv4/ip_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ int ip_call_ra_chain(struct sk_buff *skb)
return 0;
}

static inline int ip_local_deliver_finish(struct sk_buff *skb)
static int ip_local_deliver_finish(struct sk_buff *skb)
{
__skb_pull(skb, ip_hdrlen(skb));

Expand Down Expand Up @@ -324,7 +324,7 @@ static inline int ip_rcv_options(struct sk_buff *skb)
return -1;
}

static inline int ip_rcv_finish(struct sk_buff *skb)
static int ip_rcv_finish(struct sk_buff *skb)
{
const struct iphdr *iph = ip_hdr(skb);
struct rtable *rt;
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/ipv4/ip_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ static inline int ip_skb_dst_mtu(struct sk_buff *skb)
skb->dst->dev->mtu : dst_mtu(skb->dst);
}

static inline int ip_finish_output(struct sk_buff *skb)
static int ip_finish_output(struct sk_buff *skb)
{
#if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)
/* Policy lookup after SNAT yielded a new policy */
Expand Down

0 comments on commit 650164e

Please sign in to comment.