From: Simon Wunderlich <sw@simonwunderlich.de> To: Joe Perches <joe@perches.com> Cc: netdev@vger.kernel.org, davem@davemloft.net, linux-wireless@vger.kernel.org, mathias.kretschmer@fokus.fraunhofer.de Subject: Re: [net-next 3/3] cfg80211: add MPLS and 802.21 classification Date: Thu, 13 Feb 2014 11:46:01 +0100 [thread overview] Message-ID: <201402131146.01749.sw@simonwunderlich.de> (raw) In-Reply-To: <1392205783.1868.5.camel@joe-AO722> Hey Joe, thanks for the comments! > On Wed, 2014-02-12 at 11:53 +0100, Simon Wunderlich wrote: > > MPLS labels may contain traffic control information, which should be > > evaluated and used by the wireless subsystem if present. > > trivial notes: > > diff --git a/net/wireless/util.c b/net/wireless/util.c > > [] > > > @@ -11,6 +11,7 @@ > > > > #include <net/ip.h> > > #include <net/dsfield.h> > > #include <linux/if_vlan.h> > > > > +#include <uapi/linux/mpls.h> > > Please try not to #include uapi files. > why not? The packet definition header has been put in UAPI, so I need that there ... or should we move that to some place else? Other protocol definition headers like IP, udp, tcp have been defined in uapi too the same way, so I figured that would be the right position. > > @@ -710,6 +711,29 @@ unsigned int cfg80211_classify8021d(struct sk_buff > > *skb, > > > > return vlan_priority; > > > > } > > > > + if (skb_headlen(skb) >= sizeof(struct ethhdr)) { > > + struct ethhdr *eh = (struct ethhdr *) skb->data; > > + struct mpls_label_stack mpls_tmp, *mpls; > > + > > + switch (eh->h_proto) { > > + case __constant_htons(ETH_P_MPLS_UC): > > > + case __constant_htons(ETH_P_MPLS_MC): > __constant_ isn't necessary for these labels. > OK, I will change that. > > switch (skb->protocol) { > > > > case htons(ETH_P_IP): > > dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; > > like this, just case htons(ETH_<FOO>) is enough. OK. I can rework and resend this particular patch - probably to linux wireless. If the other patches are ok, would you guys merge the first two patches to net- next then? Thanks, Simon
WARNING: multiple messages have this Message-ID (diff)
From: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org> To: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, mathias.kretschmer-8LS2qeF34IpklNlQbfROjRvVK+yQ3ZXh@public.gmane.org Subject: Re: [net-next 3/3] cfg80211: add MPLS and 802.21 classification Date: Thu, 13 Feb 2014 11:46:01 +0100 [thread overview] Message-ID: <201402131146.01749.sw@simonwunderlich.de> (raw) In-Reply-To: <1392205783.1868.5.camel@joe-AO722> Hey Joe, thanks for the comments! > On Wed, 2014-02-12 at 11:53 +0100, Simon Wunderlich wrote: > > MPLS labels may contain traffic control information, which should be > > evaluated and used by the wireless subsystem if present. > > trivial notes: > > diff --git a/net/wireless/util.c b/net/wireless/util.c > > [] > > > @@ -11,6 +11,7 @@ > > > > #include <net/ip.h> > > #include <net/dsfield.h> > > #include <linux/if_vlan.h> > > > > +#include <uapi/linux/mpls.h> > > Please try not to #include uapi files. > why not? The packet definition header has been put in UAPI, so I need that there ... or should we move that to some place else? Other protocol definition headers like IP, udp, tcp have been defined in uapi too the same way, so I figured that would be the right position. > > @@ -710,6 +711,29 @@ unsigned int cfg80211_classify8021d(struct sk_buff > > *skb, > > > > return vlan_priority; > > > > } > > > > + if (skb_headlen(skb) >= sizeof(struct ethhdr)) { > > + struct ethhdr *eh = (struct ethhdr *) skb->data; > > + struct mpls_label_stack mpls_tmp, *mpls; > > + > > + switch (eh->h_proto) { > > + case __constant_htons(ETH_P_MPLS_UC): > > > + case __constant_htons(ETH_P_MPLS_MC): > __constant_ isn't necessary for these labels. > OK, I will change that. > > switch (skb->protocol) { > > > > case htons(ETH_P_IP): > > dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; > > like this, just case htons(ETH_<FOO>) is enough. OK. I can rework and resend this particular patch - probably to linux wireless. If the other patches are ok, would you guys merge the first two patches to net- next then? Thanks, Simon -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-02-13 10:46 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-12 10:53 [net-next 0/3] 802.21 and MPLS headers and classification Simon Wunderlich 2014-02-12 10:53 ` Simon Wunderlich 2014-02-12 10:53 ` [net-next 1/3] if_ether.h: add IEEE 802.21 Ethertype Simon Wunderlich 2014-02-12 10:53 ` Simon Wunderlich 2014-02-12 10:53 ` [net-next 2/3] UAPI: add MPLS label stack definition Simon Wunderlich 2014-02-12 10:53 ` Simon Wunderlich 2014-02-12 10:53 ` [net-next 3/3] cfg80211: add MPLS and 802.21 classification Simon Wunderlich 2014-02-12 10:53 ` Simon Wunderlich 2014-02-12 11:49 ` Joe Perches 2014-02-12 12:46 ` [PATCH] checkpatch: Warn on uses of __constant_<foo> functions Joe Perches 2014-02-13 10:46 ` Simon Wunderlich [this message] 2014-02-13 10:46 ` [net-next 3/3] cfg80211: add MPLS and 802.21 classification Simon Wunderlich 2014-02-13 11:14 ` Joe Perches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=201402131146.01749.sw@simonwunderlich.de \ --to=sw@simonwunderlich.de \ --cc=davem@davemloft.net \ --cc=joe@perches.com \ --cc=linux-wireless@vger.kernel.org \ --cc=mathias.kretschmer@fokus.fraunhofer.de \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.