Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41919
b: refs/heads/master
c: 824621e
h: refs/heads/master
i:
  41917: 4fe1394
  41915: b788f62
  41911: ae1cda6
  41903: abd4910
  41887: 126bb81
  41855: 59e890c
v: v3
  • Loading branch information
Martin Josefsson authored and David S. Miller committed Dec 3, 2006
1 parent bc3bdbc commit 0fe4f61
Show file tree
Hide file tree
Showing 4 changed files with 1 addition 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: 3ffd5eeb1a031ad226c80ae6e658970cd08569e2
refs/heads/master: 824621eddd2087b0e6f0b2e0da91e8d77e4919bf
3 changes: 0 additions & 3 deletions trunk/include/net/netfilter/nf_conntrack_l3proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ struct nfattr;

struct nf_conntrack_l3proto
{
/* Next pointer. */
struct list_head list;

/* L3 Protocol Family number. ex) PF_INET */
u_int16_t l3proto;

Expand Down
3 changes: 0 additions & 3 deletions trunk/include/net/netfilter/nf_conntrack_l4proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ struct nfattr;

struct nf_conntrack_l4proto
{
/* Next pointer. */
struct list_head list;

/* L3 Protocol number. */
u_int16_t l3proto;

Expand Down
1 change: 0 additions & 1 deletion trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[],

struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =
{
.list = { NULL, NULL },
.l3proto = PF_INET,
.l4proto = IPPROTO_ICMP,
.name = "icmp",
Expand Down

0 comments on commit 0fe4f61

Please sign in to comment.