Skip to contentSkip to conversation

net: flow_dissector.c missing include linux/export.h

PATCH In review Jesper Dangaard Brouer 5 participants 7 messages Jan 24, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: flow_dissector.c missing include linux/export.h

The file net/core/flow_dissector.c seems to be missing including linux/export.h.

---
 net/core/flow_dissector.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/flow_dissector.c +1 -0
index 0985b9b..a225089 100644
@@ -1,4 +1,5 @@
 #include <linux/skbuff.h>
+#include <linux/export.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/if_vlan.h>
Signature · 1 line
1.7.2.5
Acked-by on v1 1/1
#1 lore raw
Quoted 13 lines · Jesper Dangaard Brouer

The file net/core/flow_dissector.c seems to be missing including linux/export.h.

---
 net/core/flow_dissector.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/flow_dissector.c +0 -0
index 0985b9b..a225089 100644

net/core/flow_dissector.c line 5

Quoted 5 lines
net/core/flow_dissector.c +1 -0
@@ -1,4 +1,5 @@
 #include <linux/skbuff.h>
+#include <linux/export.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/if_vlan.h>

Hmm, not sure how you found this, since export.h is included from linux/netdevice.h (via net/netprio_cgroup.h & linux/module.h)

Or maybe you want to remove linux/module.h inclusion from net/netprio_cgroup.h ???

#2 lore raw
Quoted 23 lines · Eric Dumazet
Quoted 13 lines · Jesper Dangaard Brouer

The file net/core/flow_dissector.c seems to be missing including linux/export.h.

---
 net/core/flow_dissector.c |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/flow_dissector.c +0 -0
index 0985b9b..a225089 100644

net/core/flow_dissector.c line 5

Quoted 5 lines
net/core/flow_dissector.c +1 -0
@@ -1,4 +1,5 @@
  #include <linux/skbuff.h>
+#include <linux/export.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>
  #include <linux/if_vlan.h>
Quoted 5 lines

Hmm, not sure how you found this, since export.h is included from linux/netdevice.h (via net/netprio_cgroup.h & linux/module.h)

Or maybe you want to remove linux/module.h inclusion from net/netprio_cgroup.h ???

That would be the better solution. I had them all killed off and it would be nice to try and keep it that way as long as possible.

I'll look into this if that wasn't part of Jesper's original intention.

Paul.

Quoted 7 lines

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

maintainer
#3 lore raw

From: Paul Gortmaker <[email protected]>
Date: Tue, 24 Jan 2012 14:44:21 -0500

Quoted 27 lines · Eric Dumazet
Quoted 26 lines · Jesper Dangaard Brouer
Quoted 13 lines

The file net/core/flow_dissector.c seems to be missing including linux/export.h.

---
 net/core/flow_dissector.c |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/flow_dissector.c +0 -0
index 0985b9b..a225089 100644

net/core/flow_dissector.c line 5

Quoted 5 lines
net/core/flow_dissector.c +1 -0
@@ -1,4 +1,5 @@
  #include <linux/skbuff.h>
+#include <linux/export.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>
  #include <linux/if_vlan.h>

Hmm, not sure how you found this, since export.h is included from linux/netdevice.h (via net/netprio_cgroup.h & linux/module.h)

Quoted 7 lines
Quoted 2 lines

Or maybe you want to remove linux/module.h inclusion from net/netprio_cgroup.h ???

That would be the better solution. I had them all killed off and it would be nice to try and keep it that way as long as possible.

I'll look into this if that wasn't part of Jesper's original intention.

Jesper did you actually hit this problem and get a real build failure?

#4 lore raw
Quoted 33 lines · David Miller

From: Paul Gortmaker <[email protected]>
Date: Tue, 24 Jan 2012 14:44:21 -0500

Quoted 30 lines · Eric Dumazet
Quoted 28 lines · Jesper Dangaard Brouer
Quoted 13 lines

The file net/core/flow_dissector.c seems to be missing including linux/export.h.

---
 net/core/flow_dissector.c |    1 +

 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/flow_dissector.c +0 -0
index 0985b9b..a225089 100644

net/core/flow_dissector.c line 5

Quoted 5 lines
net/core/flow_dissector.c +1 -0
@@ -1,4 +1,5 @@
  #include <linux/skbuff.h>
+#include <linux/export.h>
  #include <linux/ip.h>
  #include <linux/ipv6.h>
  #include <linux/if_vlan.h>

Hmm, not sure how you found this, since export.h is included from linux/netdevice.h (via net/netprio_cgroup.h & linux/module.h)

Or maybe you want to remove linux/module.h inclusion from net/netprio_cgroup.h ???

Quoted 7 lines
Quoted 4 lines

That would be the better solution.  I had them all killed off and it would be nice to try and keep it that way as long as possible.

I'll look into this if that wasn't part of Jesper's original intention.

Jesper did you actually hit this problem and get a real build failure?

I've reproduced it locally, and verified it as a fix, but only *after* I've deleted the module.h from netprio_cgroup.h

Doing builds to see what else (aside from the dsa/mv88e6xxx) shakes loose. Hopefully that is it. If so, I'll send a patch shortly to delete the module.h

Paul.

Quoted 4 lines

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

maintainer
#5 lore raw

From: Paul Gortmaker <[email protected]>
Date: Tue, 24 Jan 2012 15:59:00 -0500

Quoted 6 lines

I've reproduced it locally, and verified it as a fix, but only *after* I've deleted the module.h from netprio_cgroup.h

Doing builds to see what else (aside from the dsa/mv88e6xxx) shakes loose. Hopefully that is it. If so, I'll send a patch shortly to delete the module.h

Ok, I'll apply Jesper's patch to 'net' then.

Thanks.

#6 lore raw
In reply to David Miller
Quoted 2 lines · David Miller

Jesper did you actually hit this problem and get a real build failure?

Yes, but I didn't explain the circumstances, sorry.

I was backporting Erics SFQ bug fix (sch_sfq: dont put new flow at the end of flows / d47a0ac7b66) to stable kernel 3.2.1.

But to avoid conflicts I also cherry-picked the other SFQ changes, plus the skb_flow_dissect changes, and cherry-picked:

# sch_sfq: use skb_flow_dissect()
# (Need flow_dissect APIs)
git cherry-pick 11fca931d35a34d01ce209eb8d51ff667c9f5e7c

# net: introduce skb_flow_dissect()
git cherry-pick 0744dd00c1b1be99a25b62b1b48df440e82e57e0

# flow_dissector: use a 64bit load/store
git cherry-pick 4d77d2b567ec66a443792d99e96ac760991d80d0

# sch_sfq: rehash queues in perturb timer
git cherry-pick 225d9b89c937633dfeec502741a174fe0bab5b9f

# sch_sfq: dont put new flow at the end of flows git cherry-pick d47a0ac7b66883987275598d6039f902f4410ca9

# net_sched: sfq: fix mem alloc error recovery git cherry-pick bd16a6cce2a7f169b559abc5672fd2c66e91fb36

So, I guess the "problem" is because I didn't have the patch, which adds the include net/netprio_cgroup.h in linux/netdevice.h, and have the side effect of including module.h, the patch:
net: add network priority cgroup infrastructure (v4) / 5bc1421e34ecfe

git describe --contains 5bc1421e34ecfe
v3.3-rc1~182^2~519

Still think it more correct to include linux/export.h in flow_dissector.c.

Signature · 7 lines
Best regards,
  Jesper Dangaard Brouer
  ComX Networks A/S
  Linux Network Kernel Developer
  Cand. Scient Datalog / MSc.CS
  Author of http://www.iptv-analyzer.org
  LinkedIn: http://www.linkedin.com/in/brouer