diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-06 05:32:02 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-06 05:32:02 +0400 |
| commit | 67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206 (patch) | |
| tree | c83ac73e3d569156d4b7f3dab3e7e27e0054cd0d /net/hsr | |
| parent | 6092c79fd00ce48ee8698955ea6419cc5cd65641 (diff) | |
| parent | c3bebc71c4bcdafa24b506adf0c1de3c1f77e2e0 (diff) | |
| download | linux-67ddc87f162e2d0e29db2b6b21c5a3fbcb8be206.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/mwifiex/pcie.c
net/ipv6/sit.c
The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.
The two wireless conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_framereg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 3d0100f0bae3..83e58449366a 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c @@ -297,7 +297,7 @@ static bool seq_nr_after(u16 a, u16 b) void hsr_register_frame_in(struct node_entry *node, enum hsr_dev_idx dev_idx) { - if ((dev_idx < 0) || (dev_idx >= HSR_MAX_DEV)) { + if ((dev_idx < 0) || (dev_idx >= HSR_MAX_SLAVE)) { WARN_ONCE(1, "%s: Invalid dev_idx (%d)\n", __func__, dev_idx); return; } |