staging: vt6656: mac.c MACvWriteMultiAddr: Remove secondary variables
PATCH v3 1/1 staging: vt6656: mac.c MACvWriteMultiAddr: Remove secondary variables
Covert to pointer, point to callers buffer and remove casting in callers.
CONTROLnsRequestOut is called with sizeof u8.
Signed-off-by Malcolm Priestley <[email protected]>
--- drivers/staging/vt6656/mac.c | 9 +++------ drivers/staging/vt6656/mac.h | 2 +- drivers/staging/vt6656/main_usb.c | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/staging/vt6656/mac.c +3 -6
@@ -55,17 +55,14 @@ static int msglevel =MSG_LEVEL_INFO;* Return Value: none * */ -void MACvWriteMultiAddr (struct vnt_private *pDevice,u32 uByteIdx,u8 byData) +void MACvWriteMultiAddr (struct vnt_private *pDevice,u32 uByteIdx,u8 *data) { -u8 byData1; - - byData1 = byData;CONTROLnsRequestOut (pDevice,MESSAGE_TYPE_WRITE , (u16) (MAC_REG_MAR0 + uByteIdx),MESSAGE_REQUEST_MACREG , -1 , - &byData1); +sizeof (u8), + data); }/*
drivers/staging/vt6656/mac.h +1 -1
@@ -403,7 +403,7 @@#define MAC_REVISION_A0 0x00#define MAC_REVISION_A1 0x01 -void MACvWriteMultiAddr (struct vnt_private *,u32 ,u8 ); +void MACvWriteMultiAddr (struct vnt_private *,u32 ,u8 *);void MACbShutdown (struct vnt_private *);void MACvSetBBType (struct vnt_private *,u8 );void MACvDisableKeyEntry (struct vnt_private *,u32 );
drivers/staging/vt6656/main_usb.c +2 -2
@@ -1394,8 +1394,8 @@ static void device_set_multi(struct net_device *dev) mc_filter[bit_nr >>5 ] |=cpu_to_le32 (1 << (bit_nr &31 )); }for (ii =0 ; ii <4 ; ii++) { -MACvWriteMultiAddr (pDevice, ii, *((u8 *)&mc_filter[0 ] + ii)); -MACvWriteMultiAddr (pDevice, ii+4 , *((u8 *)&mc_filter[1 ] + ii)); +MACvWriteMultiAddr (pDevice, ii, (u8 *)&mc_filter[0 ] + ii); +MACvWriteMultiAddr (pDevice, ii +4 , (u8 *)&mc_filter[1 ] + ii); } pDevice->byRxMode &= ~(RCR_UNICAST ); pDevice->byRxMode |= (RCR_MULTICAST |RCR_BROADCAST );
Signature · 1 line
1.8.4.4
Quoted 1 line · Malcolm Priestley
Covert to pointer, point to callers buffer and remove casting in callers.
[]
drivers/staging/vt6656/main_usb.c
Quoted 1 line
drivers/staging/vt6656/main_usb.c +0
-0
[]
drivers/staging/vt6656/main_usb.c static void device_set_multi(struct net_device *dev) · line 1394
Quoted 2 lines
drivers/staging/vt6656/main_usb.c +0
-0@@ -1394,8 +1394,8 @@ static void device_set_multi(struct net_device *dev) mc_filter[bit_nr >>5 ] |=cpu_to_le32 (1 << (bit_nr &31 ));
A possible thing to fix for another day:
mc_filter is u32 but should probably be __le32 instead. ORing a u32 and a cpu_to_le32 isn't ideal.