diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-30 09:13:03 +0200 |
| commit | fcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch) | |
| tree | db022324c4978dd9af059be38822d23455a45f55 /net/sched/em_meta.c | |
| parent | 5e31fc0815a4e2c72b1b495fe7a0d8f9bfb9e4b4 (diff) | |
| parent | 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755 (diff) | |
| download | blackbird-op-linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.gz blackbird-op-linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.zip | |
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/sched/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 4790c696cbce..4ab6e3325573 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c @@ -264,7 +264,7 @@ META_COLLECTOR(int_rtiif) if (unlikely(skb_rtable(skb) == NULL)) *err = -1; else - dst->value = skb_rtable(skb)->rt_iif; + dst->value = inet_iif(skb); } /************************************************************************** |
