Attachment 244404 Details for Bug 239891 – Patch to fix ""redefinition of frame"

[patch] Patch to fix ""redefinition of frame"

aoe-frame.patch (text/plain), 1.44 KB, created by chadf on 2023-08-28 02:34:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chadf

Created: 2023-08-28 02:34:26 UTC

Size: 1.44 KB

patch

obsolete

>--- dev/aoe/aoenet.c.orig	2023-08-27 19:09:39.177358000 +0000
>+++ dev/aoe/aoenet.c	2023-08-27 19:11:50.115548000 +0000
>@@ -52,6 +52,8 @@
> 
> #include <dev/aoe/aoe.h>
> 
>+#define	frame	aoeframe
>+
> /*
>  * FORCE_NETWORK_HOOK is defined to support kernels that have not been patched
>  * to recognize AoE packets.
>--- dev/aoe/aoedev.c.orig	2006-05-22 18:01:13.000000000 +0000
>+++ dev/aoe/aoedev.c	2023-08-27 19:12:16.604678000 +0000
>@@ -51,6 +51,8 @@
> 
> #include <dev/aoe/aoe.h>
> 
>+#define	frame	aoeframe
>+
> static struct aoedev *devlist;
> static struct mtx devlist_mtx;
> static int sysctl_aoe_devices(SYSCTL_HANDLER_ARGS);
>--- dev/aoe/aoecmd.c.orig	2023-08-27 19:09:39.118434000 +0000
>+++ dev/aoe/aoecmd.c	2023-08-27 19:12:25.479975000 +0000
>@@ -48,6 +48,8 @@
> 
> #include <dev/aoe/aoe.h>
> 
>+#define	frame	aoeframe
>+
> #define TIMERTICK (hz / 10)
> #define MINTIMER (2 * TIMERTICK)
> #define MAXTIMER (hz << 1)
>--- dev/aoe/aoe.h.orig	2006-05-25 19:11:48.000000000 +0000
>+++ dev/aoe/aoe.h	2023-08-27 19:12:49.916051000 +0000
>@@ -35,6 +35,8 @@
> 
> #include <sys/taskqueue.h>
> 
>+#define	frame	aoeframe
>+
> #define XPRINTK(L, fmt, arg...) log(L, "aoe:" " %s: " fmt, __func__, ## arg)
> #define IPRINTK(fmt, arg...) XPRINTK(LOG_INFO, fmt, ## arg)
> #define EPRINTK(fmt, arg...) XPRINTK(LOG_ERR, fmt, ## arg)
>@@ -229,5 +231,7 @@
> void aoenet_xmitbcast(u_short, u_char);
> u_char *aoenet_enaddr(struct ifnet *);
> u_int aoenet_maxsize(struct ifnet *);
>+
>+#undef	frame
> 
> #endif /* ! _AOE_H */

Actions: View | Diff

Attachments on bug 239891: 206600 | 243991 | 243992 | 244404 | 244662 | 244700