sven
/
intrepid-socketcan-kernel-module
mirror of https://github.com/intrepidcs/intrepid-socketcan-kernel-module.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Ethernet interfaces

master
Kyle Schwarz 2025-05-23 10:17:41 -04:00
parent 7158af4b73
commit 8618f2e75e
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
intrepid.c
View File

@ -70,6 +70,7 @@ MODULE_DESCRIPTION(KO_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Paul Hollinsky <phollinsky@intrepidcs.com>"); MODULE_AUTHOR("Paul Hollinsky <phollinsky@intrepidcs.com>");
MODULE_AUTHOR("Jeffrey Quesnelle <jeffq@intrepidcs.com>"); MODULE_AUTHOR("Jeffrey Quesnelle <jeffq@intrepidcs.com>");
MODULE_AUTHOR("Kyle Schwarz <kschwarz@intrepidcs.com>");
MODULE_VERSION(KO_VERSION); MODULE_VERSION(KO_VERSION);
#define INTREPID_DEVICE_NAME "intrepid_netdevice" #define INTREPID_DEVICE_NAME "intrepid_netdevice"
@ -319,7 +320,7 @@ static netdev_tx_t intrepid_ETH_netdevice_xmit(struct sk_buff *skb, struct net_d
intrepid_unpause_all_queues(); intrepid_unpause_all_queues();
} }
msg.length = skb->len - ETH_HLEN; msg.length = skb->len;
msg.netid = dev->base_addr; msg.netid = dev->base_addr;
msg.type = ICSNEO_NETWORK_TYPE_ETHERNET; msg.type = ICSNEO_NETWORK_TYPE_ETHERNET;
@ -337,7 +338,7 @@ static netdev_tx_t intrepid_ETH_netdevice_xmit(struct sk_buff *skb, struct net_d
/* Copy the message into the usermode box */ /* Copy the message into the usermode box */
memcpy(tx_boxes[current_tx_box] + tx_box_bytes[current_tx_box], &msg, sizeof(neomessage_eth_t)); memcpy(tx_boxes[current_tx_box] + tx_box_bytes[current_tx_box], &msg, sizeof(neomessage_eth_t));
tx_box_bytes[current_tx_box] += sizeof(neomessage_eth_t); tx_box_bytes[current_tx_box] += sizeof(neomessage_eth_t);
memcpy(tx_boxes[current_tx_box] + tx_box_bytes[current_tx_box], skb->data, skb->len - ETH_HLEN); memcpy(tx_boxes[current_tx_box] + tx_box_bytes[current_tx_box], skb->data, skb->len);
tx_box_bytes[current_tx_box] += msg.length; tx_box_bytes[current_tx_box] += msg.length;
tx_box_count[current_tx_box]++; tx_box_count[current_tx_box]++;
@ -696,7 +697,6 @@ static bool handle_CAN_transmit_receipt(
} }
static bool handle_ETH_transmit_receipt( static bool handle_ETH_transmit_receipt(
struct net_device *device,
const neomessage_eth_t *msg, const neomessage_eth_t *msg,
const uint8_t *data, const uint8_t *data,
struct net_device_stats *stats) struct net_device_stats *stats)
@ -782,7 +782,8 @@ static int intrepid_add_eth_if(struct intrepid_netdevice **result, const char *r
} }
dev->base_addr = i; dev->base_addr = i;
dev->flags = IFF_ECHO; dev->flags |= IFF_BROADCAST | IFF_MULTICAST | IFF_RUNNING;
dev->operstate = IF_OPER_UP;
#if KERNEL_CHECKS_MTU_RANGE #if KERNEL_CHECKS_MTU_RANGE
dev->min_mtu = ETH_MIN_MTU; dev->min_mtu = ETH_MIN_MTU;
dev->max_mtu = ETH_MAX_MTU; dev->max_mtu = ETH_MAX_MTU;
@ -801,6 +802,8 @@ static int intrepid_add_eth_if(struct intrepid_netdevice **result, const char *r
} }
} }
#endif #endif
eth_hw_addr_random(dev);
ics = netdev_priv(dev); ics = netdev_priv(dev);
ics->dev = dev; ics->dev = dev;
ics->is_stopped = 0; ics->is_stopped = 0;
@ -831,27 +834,20 @@ static int intrepid_fill_eth_frame_from_neomessage(
struct net_device_stats *stats, struct net_device_stats *stats,
const neomessage_eth_t *msg, const neomessage_eth_t *msg,
const uint8_t *data, const uint8_t *data,
struct sk_buff *skb, struct sk_buff *skb)
struct net_device *device)
{ {
struct ethhdr *eth;
if (unlikely(msg->length > (ETH_FRAME_LEN + ETH_FCS_LEN))) { if (unlikely(msg->length > (ETH_FRAME_LEN + ETH_FCS_LEN))) {
stats->rx_dropped++; stats->rx_dropped++;
pr_warn("intrepid: Dropping message on %s, invalid message length %ld", device->name, msg->length); return -1;
return 1;
} }
if (unlikely(skb == NULL)) { if (unlikely(skb == NULL)) {
stats->rx_dropped++; stats->rx_dropped++;
pr_warn("intrepid: Dropping message on %s, skb allocation failed", device->name); return -1;
return 1;
} }
skb_reset_mac_header(skb); skb_put_data(skb, data, msg->length);
eth = skb_put(skb, sizeof(struct ethhdr)); skb->protocol = eth_type_trans(skb, skb->dev);
*eth = *(struct ethhdr*)data;
skb->protocol = htons(ETH_P_802_3);
skb_put_data(skb, data + ETH_HLEN, msg->length);
stats->rx_bytes += msg->length; stats->rx_bytes += msg->length;
stats->rx_packets++; stats->rx_packets++;
@ -919,20 +915,16 @@ static struct sk_buff *intrepid_skb_from_neomessage(
case ICSNEO_NETWORK_TYPE_ETHERNET: case ICSNEO_NETWORK_TYPE_ETHERNET:
{ {
const neomessage_eth_t *msg = (const neomessage_eth_t*)msg_generic; const neomessage_eth_t *msg = (const neomessage_eth_t*)msg_generic;
if (handle_ETH_transmit_receipt(device, msg, data, stats)) if (handle_ETH_transmit_receipt(msg, data, stats))
goto out; goto out;
skb = netdev_alloc_skb(device, ETH_DATA_LEN); skb = netdev_alloc_skb_ip_align(device, msg->length);
if (unlikely(skb == NULL)) { if (unlikely(skb == NULL)) {
stats->rx_dropped++; stats->rx_dropped++;
pr_warn("intrepid: Dropping message on %s, skb allocation failed", device->name); pr_warn("intrepid: Dropping message on %s, skb allocation failed", device->name);
goto out; goto out;
} }
ret = intrepid_fill_eth_frame_from_neomessage(
stats, ret = intrepid_fill_eth_frame_from_neomessage(stats, msg, data, skb);
msg,
data,
skb,
device);
} }
break; break;
default: default: