From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 27 Feb 2015 00:05:08 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4748ead113142d87ddece7fee107e411339d87c;p=thirdparty%2Fgrub.git

Merge branch 'master' into next

Conflicts:
	ChangeLog-2015
	grub-core/net/drivers/ieee1275/ofnet.c
	include/grub/ieee1275/ieee1275.h
---

c4748ead113142d87ddece7fee107e411339d87c
diff --cc include/grub/net.h
index cce3edae7,538baa33e..58d24f7c6
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@@ -537,7 -536,6 +537,8 @@@ extern char *grub_net_default_server
  
  #define GRUB_NET_TRIES 40
  #define GRUB_NET_INTERVAL 400
+ #define GRUB_NET_INTERVAL_ADDITION 20
  
 +#define VLANTAG_IDENTIFIER 0x8100
 +
  #endif /* ! GRUB_NET_HEADER */