Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14799
b: refs/heads/master
c: 4b30b1c
h: refs/heads/master
i:
  14797: 72a08f7
  14795: 279a8dd
  14791: c9f4e59
  14783: 2c090f6
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Nov 30, 2005
1 parent fcfa2de commit 3cd3470
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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: 9b5b5cff9a6655dbb6d2e2be365bb95eec3950eb
refs/heads/master: 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56
2 changes: 1 addition & 1 deletion trunk/net/ipv4/ip_gre.c
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
return 0;
}

int __init ipgre_fb_tunnel_init(struct net_device *dev)
static int __init ipgre_fb_tunnel_init(struct net_device *dev)
{
struct ip_tunnel *tunnel = (struct ip_tunnel*)dev->priv;
struct iphdr *iph = &tunnel->parms.iph;
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 @@ -690,7 +690,7 @@ csum_page(struct page *page, int offset, int copy)
return csum;
}

inline int ip_ufo_append_data(struct sock *sk,
static inline int ip_ufo_append_data(struct sock *sk,
int getfrag(void *from, char *to, int offset, int len,
int odd, struct sk_buff *skb),
void *from, int length, int hh_len, int fragheaderlen,
Expand Down

0 comments on commit 3cd3470

Please sign in to comment.