diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-03-21 23:21:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-22 21:33:11 -0400 |
commit | 3e4aa12f8a81506c44f04b4f0eb7663981c5a282 (patch) | |
tree | 154a7c3600d318da2ca1623f835aa1823c571ee3 /drivers/infiniband | |
parent | 664ffe80c0df5ad2576420ed2e6bd75cc704ba3a (diff) |
ipoib: remove addrlen check for mc addresses
Finally this bit can be removed. Currently, after the bonding driver is
changed/fixed (32a806c194ea112cfab00f558482dd97bee5e44e net-next-2.6),
that's not possible for an addr with different length than dev->addr_len
to be present in list. Removing this check as in new mc_list there will be
no addrlen in the record.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index d41ea27be5e1..19eba3c877cb 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
@@ -767,11 +767,8 @@ void ipoib_mcast_dev_flush(struct net_device *dev) | |||
767 | } | 767 | } |
768 | } | 768 | } |
769 | 769 | ||
770 | static int ipoib_mcast_addr_is_valid(const u8 *addr, unsigned int addrlen, | 770 | static int ipoib_mcast_addr_is_valid(const u8 *addr, const u8 *broadcast) |
771 | const u8 *broadcast) | ||
772 | { | 771 | { |
773 | if (addrlen != INFINIBAND_ALEN) | ||
774 | return 0; | ||
775 | /* reserved QPN, prefix, scope */ | 772 | /* reserved QPN, prefix, scope */ |
776 | if (memcmp(addr, broadcast, 6)) | 773 | if (memcmp(addr, broadcast, 6)) |
777 | return 0; | 774 | return 0; |
@@ -815,7 +812,6 @@ void ipoib_mcast_restart_task(struct work_struct *work) | |||
815 | union ib_gid mgid; | 812 | union ib_gid mgid; |
816 | 813 | ||
817 | if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr, | 814 | if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr, |
818 | mclist->dmi_addrlen, | ||
819 | dev->broadcast)) | 815 | dev->broadcast)) |
820 | continue; | 816 | continue; |
821 | 817 | ||