* grub-core/net/i386/pc/pxe.c (grub_pxe_recv): Fix declaration.

	(grub_pxe_send): Likewise.
	(GRUB_MOD_INIT): Fix types.

diff --git a/ChangeLog b/ChangeLog
index 286648a46e95e646c2ae8003df92712c555978d2..4cac3cd65d8cdd3b06168da968bdd90ec795f059 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/net/i386/pc/pxe.c (grub_pxe_recv): Fix declaration.
+       (grub_pxe_send): Likewise.
+       (GRUB_MOD_INIT): Fix types.
+
 2011-06-24  Szymon Janc <szymon@janc.net.pl>
 
        * grub-core/io/xzio.c: Fix code style issues

diff --git a/grub-core/net/i386/pc/pxe.c b/grub-core/net/i386/pc/pxe.c
index 27c4af17f926e026f781169072c327c20edcfd8b..a23104baded4447a73b9fa127a9fb01ec4a768ac 100644 (file)
--- a/grub-core/net/i386/pc/pxe.c
+++ b/grub-core/net/i386/pc/pxe.c
@@ -305,14 +305,14 @@ static struct grub_fs grub_pxefs_fs =
   };
 
 static grub_ssize_t 
-grub_pxe_recv (struct grub_net_card *dev __attribute__ ((unused)),
+grub_pxe_recv (const struct grub_net_card *dev __attribute__ ((unused)),
               struct grub_net_buff *buf __attribute__ ((unused)))
 {
   return 0;
 }
 
 static grub_err_t 
-grub_pxe_send (struct grub_net_card *dev __attribute__ ((unused)),
+grub_pxe_send (const struct grub_net_card *dev __attribute__ ((unused)),
               struct grub_net_buff *buf __attribute__ ((unused)))
 {
   return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "not implemented");
@@ -424,7 +424,7 @@ GRUB_MOD_INIT(pxe)
 {
   struct grub_pxe_bangpxe *pxenv;
   struct grub_pxenv_get_cached_info ci;
-  struct grub_net_bootp_ack *bp;
+  struct grub_net_bootp_packet *bp;
   char *buf;
 
   pxenv = grub_pxe_scan ();