Commit 27cced20 authored by Michael Karcher's avatar Michael Karcher Committed by David S. Miller

net-next: ax88796: Add block_input/output hooks to ax_plat_data

Add platform specific hooks for block transfer reads/writes of packet
buffer data, superseding the default provided ax_block_input/output.
Currently used for m68k Amiga XSurf100.
Signed-off-by: default avatarMichael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9144c379
...@@ -758,8 +758,14 @@ static int ax_init_dev(struct net_device *dev) ...@@ -758,8 +758,14 @@ static int ax_init_dev(struct net_device *dev)
#endif #endif
ei_local->reset_8390 = &ax_reset_8390; ei_local->reset_8390 = &ax_reset_8390;
ei_local->block_input = &ax_block_input; if (ax->plat->block_input)
ei_local->block_output = &ax_block_output; ei_local->block_input = ax->plat->block_input;
else
ei_local->block_input = &ax_block_input;
if (ax->plat->block_output)
ei_local->block_output = ax->plat->block_output;
else
ei_local->block_output = &ax_block_output;
ei_local->get_8390_hdr = &ax_get_8390_hdr; ei_local->get_8390_hdr = &ax_get_8390_hdr;
ei_local->priv = 0; ei_local->priv = 0;
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#ifndef __NET_AX88796_PLAT_H #ifndef __NET_AX88796_PLAT_H
#define __NET_AX88796_PLAT_H #define __NET_AX88796_PLAT_H
struct sk_buff;
struct net_device;
#define AXFLG_HAS_EEPROM (1<<0) #define AXFLG_HAS_EEPROM (1<<0)
#define AXFLG_MAC_FROMDEV (1<<1) /* device already has MAC */ #define AXFLG_MAC_FROMDEV (1<<1) /* device already has MAC */
#define AXFLG_HAS_93CX6 (1<<2) /* use eeprom_93cx6 driver */ #define AXFLG_HAS_93CX6 (1<<2) /* use eeprom_93cx6 driver */
...@@ -26,6 +29,12 @@ struct ax_plat_data { ...@@ -26,6 +29,12 @@ struct ax_plat_data {
u32 *reg_offsets; /* register offsets */ u32 *reg_offsets; /* register offsets */
u8 *mac_addr; /* MAC addr (only used when u8 *mac_addr; /* MAC addr (only used when
AXFLG_MAC_FROMPLATFORM is used */ AXFLG_MAC_FROMPLATFORM is used */
/* uses default ax88796 buffer if set to NULL */
void (*block_output)(struct net_device *dev, int count,
const unsigned char *buf, int star_page);
void (*block_input)(struct net_device *dev, int count,
struct sk_buff *skb, int ring_offset);
}; };
#endif /* __NET_AX88796_PLAT_H */ #endif /* __NET_AX88796_PLAT_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment