Wed, Feb 24, 2010 at 08:46:24PM CET, [email protected] wrote:
>Hi Jiri,
>
>I am having trouble applying your patch. It is erroring out on hunk #5.
>Current nes_nic.c does not have this line:
>
>>- netdev_mc_count(netdev), !!(netdev->flags & IFF_PROMISC),
This is present in current net-next tree.
Jirka
>
>Did I miss an old patch?
>
>Chien
>
>For reference:
>
>>diff --git a/drivers/infiniband/hw/nest/nes_nic.c
>>b/drivers/infiniband/hw/nest/nes_nic.c
>>index c04f8fc..9384f5d 100644
>>--- a/drivers/infiniband/hw/nes/nes_nic.c
>>+++ b/drivers/infiniband/hw/nest/nes_nic.c
>[...]
>>@@ -862,19 +871,30 @@ static void nes_netdev_set_multicast_list(struct
>>net_device *netdev)
>> }
>>
>> nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscous = %d,
>> All Multicast = %d.\n",
>>- netdev_mc_count(netdev), !!(netdev->flags & IFF_PROMISC),
>>+ mc_count, !!(netdev->flags & IFF_PROMISC),
>> !!(netdev->flags & IFF_ALLMULTI));
>> if (!mc_all_on) {
>>- multicast_addr = netdev->mc_list;
>>+ char *addrs;
>>+ int i;
>>+ struct dev_mc_list *mcaddr;
>>+
>>+ addrs = kmalloc(ETH_ALEN * mc_count, GFP_ATOMIC);
>>+ if (!addrs) {
>>+ set_allmulti(nesdev, nic_active_bit);
>>+ goto unlock;
>>+ }
>>+ i = 0;
>>+ netdev_for_each_mc_addr(mcaddr, netdev)
>>+ memcpy(get_addr(addrs, i++),
>>+ mcaddr->dmi_addr, ETH_ALEN);
>>+
>> perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW +
>> pft_entries_preallocated * 0x8;
>>- for (mc_index = 0; mc_index < max_pft_entries_avaiable;
>>- mc_index++) {
>>- while (multicast_addr && nesvnic->mcrq_mcast_filter &&
>>+ for (i = 0, mc_index = 0; mc_index < max_pft_entries_avaiable;
>>+ mc_index++) {
>>+ while (i < mc_count && nesvnic->mcrq_mcast_filter &&
>> ((mc_nic_index = nesvnic->mcrq_mcast_filter(nesvnic,
>>- multicast_addr->dmi_addr)) == 0)) {
>>- multicast_addr = multicast_addr->next;
>>- }
>>+ get_addr(addrs, i++))) == 0));
>> if (mc_nic_index < 0)
>> mc_nic_index = nesvnic->nic_index;
>> while (nesadapter->pft_mcast_map[mc_index] < 16 &&
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
