On 12/18/2011 08:26, Sergei Shtylyov wrote:
>> @@ -57,6 +58,12 @@ static const char *meth_str="SGI O2 Fast
>> static int timeout = TX_TIMEOUT;
>> module_param(timeout, int, 0);
>>
>> +/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
>> + * MACE Ethernet uses a 64 element hash table based on the Ethernet CRC.
>> + */
>> +static int multicast_filter_limit = 32;
>> +
>> +
>
> On empty oine would be enough...
>
Fixed, as Dave pointed out. I converted it and the driver name to a macro
anyways.
>> /*
>> * This structure is private to each device. It is used to pass
>> * packets in and out, so there is place for a packet
>> @@ -765,15 +775,51 @@ static int meth_ioctl(struct net_device
>> }
>> }
>>
>> +static void meth_set_rx_mode(struct net_device *dev)
>> +{
>> + struct meth_private *priv = netdev_priv(dev);
>> + unsigned long flags;
>> +
>> + netif_stop_queue(dev);
>> + spin_lock_irqsave(&priv->meth_lock, flags);
>> + priv->mac_ctrl&= ~(METH_PROMISC);
>
> Parens not needed here.
>
Yeah, I am a habitual parenthesis abuser. You should see the RTC driver I
re-wrote :)
>> +
>> + if (dev->flags & IFF_PROMISC) {
>> + priv->mac_ctrl |= METH_PROMISC;
>> + priv->mcast_filter = 0xffffffffffffffffUL;
>> + mace->eth.mac_ctrl = priv->mac_ctrl;
>> + mace->eth.mcast_filter = priv->mcast_filter;
>> + } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
>> + (dev->flags & IFF_ALLMULTI)) {
>> + priv->mac_ctrl |= METH_ACCEPT_AMCAST;
>> + priv->mcast_filter = 0xffffffffffffffffUL;
>> + mace->eth.mac_ctrl = priv->mac_ctrl;
>> + mace->eth.mcast_filter = priv->mcast_filter;
>
> This block is over-indented.
>
Weird. The editor I was using had the tabs set to an equivalent of 4
spaces, so it lined up for me *originally*, but after the patch was applied,
it was out of alignment, too. I think I got it fixed this time, though.
Not sure what was causing that.
>> + } else {
>> + struct netdev_hw_addr *ha;
>> + priv->mac_ctrl |= METH_ACCEPT_MCAST;
>> +
>> + netdev_for_each_mc_addr(ha, dev)
>> + set_bit((ether_crc(ETH_ALEN, ha->addr) >> 26),
>> + (volatile long unsigned int *)&priv->mcast_filter);
>> +
>> + mace->eth.mcast_filter = priv->mcast_filter;
>
> This last statement is common between all branches, so could be moved out
> of *if*...
>
Done.
>> + }
>> +
>> + spin_unlock_irqrestore(&priv->meth_lock, flags);
>> + netif_wake_queue(dev);
>> +}
>> +
>> static const struct net_device_ops meth_netdev_ops = {
>> - .ndo_open = meth_open,
>> - .ndo_stop = meth_release,
>> - .ndo_start_xmit = meth_tx,
>> - .ndo_do_ioctl = meth_ioctl,
>> - .ndo_tx_timeout = meth_tx_timeout,
>> - .ndo_change_mtu = eth_change_mtu,
>> - .ndo_validate_addr = eth_validate_addr,
>> + .ndo_open = meth_open,
>> + .ndo_stop = meth_release,
>> + .ndo_start_xmit = meth_tx,
>> + .ndo_do_ioctl = meth_ioctl,
>> + .ndo_tx_timeout = meth_tx_timeout,
>> + .ndo_change_mtu = eth_change_mtu,
>> + .ndo_validate_addr = eth_validate_addr,
>> .ndo_set_mac_address = eth_mac_addr,
>> + .ndo_set_rx_mode = meth_set_rx_mode,
>
> The intializer values are not aligned now, and they were before the patch.
Yeah, same problem as above. Not sure how my tabs got mangled. Should be
fixed in the next revision once I test it.
Thanks!
--
Joshua Kinard
Gentoo/MIPS
kumba@xxxxxxxxxx
4096R/D25D95E3 2011-03-28
"The past tempts us, the present confuses us, the future frightens us. And
our lives slip away, moment by moment, lost in that vast, terrible in-between."
--Emperor Turhan, Centauri Republic
